# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1312810944 -7200
# Node ID 23c750bdc766b9ec690e437d820755f987a0928d
# Parent  138cd1bd2f88e84b6cd1779219a684946f9d5d53
Updates from SVN

diff -r 138cd1bd2f88 -r 23c750bdc766 SVN__BranchQuery.st
--- a/SVN__BranchQuery.st	Mon Aug 08 15:42:03 2011 +0200
+++ b/SVN__BranchQuery.st	Mon Aug 08 15:42:24 2011 +0200
@@ -1,3 +1,28 @@
+"
+ Copyright (c) 2007-2010 Jan Vrany
+ Copyright (c) 2009-2010 eXept Software AG
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the 'Software'), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+"
 "{ Package: 'stx:libsvn' }"
 
 "{ NameSpace: SVN }"
@@ -9,6 +34,42 @@
 	category:'SVN-Queries'
 !
 
+!BranchQuery class methodsFor:'documentation'!
+
+copyright
+"
+ Copyright (c) 2007-2010 Jan Vrany
+ Copyright (c) 2009-2010 eXept Software AG
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the 'Software'), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+"
+! !
+
+!BranchQuery class methodsFor:'others'!
+
+version_CVS
+    ^ '$ÂHeader: /cvs/stx/stx/libsvn/SVN__BranchQuery.st,v 1.4 2009/10/19 12:23:18 fm Exp Â$'
+! !
 
 !BranchQuery methodsFor:'accessing'!
 
@@ -28,32 +89,26 @@
 
 defaultAction
 
-    | branches branch dlg |
-    branches := repository branches.
-    branches size = 1 ifTrue:[^branches anyOne].
-    Screen current ifNil:[^super defaultAction].
-    dlg := BranchSelectionDialog on: repository.
-    branch := dlg open.
+    | branch |
+    branch := repository branchOrNil.
+    branch ifNil:[branch := (BranchSelectionDialog on: repository) open; branch].    
     branch ifNil:
-        [branch := branches 
+        [branch := repository branches 
                     detect:[:b | b isTrunk]
                     ifNone:[self error: 'No branch!!']].
     ^branch
 
     "Created: / 14-04-2008 / 11:55:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 17-03-2009 / 18:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 10-03-2010 / 18:26:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !BranchQuery class methodsFor:'documentation'!
 
 version
-    ^ '$Header$'
-!
-
-version_CVS
-    ^ '$Header$'
+    ^ '$Id$'
 !
 
 version_SVN
-    ^'§Id: SVN__BranchQuery.st 70 2009-04-16 12:47:44Z vranyj1 §'
+    ^ '§Id: SVN__BranchQuery.st 350 2011-07-07 18:42:56Z vranyj1 §'
 ! !