Mercurial > gub

changeset 3485:6aedb71a61f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small cleanup: check darcs out in _darcs (<vcs>) rather than .darcs repositories.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sat, 12 May 2007 15:58:47 +0200
parents 4d781ba5e0bb
children b55a3a1cc0ca
files gub/repository.py
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gub/repository.py	Fri May 11 23:38:10 2007 +0200
+++ b/gub/repository.py	Sat May 12 15:58:47 2007 +0200
@@ -124,7 +124,7 @@
 
 class Darcs (Repository):
     def __init__ (self, dir, source=''):
-        Repository.__init__ (self, dir, '.darcs', source)
+        Repository.__init__ (self, dir, '_darcs', source)
 
     def darcs_pipe (self, cmd):
         dir = self.dir
@@ -138,7 +138,7 @@
         return self.darcs_pipe ('changes --last=1')
     
     def is_downloaded (self):
-        return os.path.isdir (self.dir + '/_darcs')
+        return os.path.isdir (os.path.join (self.dir, self.vcs))
 
     def download (self):
         source = self.source
@@ -180,7 +180,8 @@
         verbose = ''
         if self.oslog and self.oslog.verbose >= self.oslog.commands:
             verbose = 'v'
-        self.system ('rsync --exclude _darcs -a%(verbose)s %(dir)s/* %(destdir)s/' % locals())
+        vcs = self.vcs
+        self.system ('rsync --exclude %(vcs)s -a%(verbose)s %(dir)s/* %(destdir)s/' % locals())
 
     def get_file_content (self, file):
         dir = self.dir
@@ -430,7 +431,7 @@
         branch = self.local_branch
         revision = self.revision
         
-        if os.path.isdir (destdir + '/.git'):
+        if os.path.isdir (os.path.join (destdir, self.vcs)):
             self.git ('pull %(repo_dir)s %(branch)s' % locals (), dir=destdir)
         else:
             self.system ('git-clone -l -s %(repo_dir)s %(destdir)s' % locals ())
@@ -617,13 +618,13 @@
             self._update (self.revision)
 
     def _copy_working_dir (self, dir, copy):
-        repository = self.vcs
+        vcs = self.vcs
         verbose = ''
 
         from gub import oslog
         if self.oslog and self.oslog.verbose >= oslog.level['command']:
             verbose = 'v'
-        self.system ('rsync -a%(verbose)s --exclude %(repository)s %(dir)s/ %(copy)s'
+        self.system ('rsync -a%(verbose)s --exclude %(vcs)s %(dir)s/ %(copy)s'
                      % locals ())
 
     def _checkout_dir (self):
@@ -633,7 +634,7 @@
         revision = self.revision
         dir = self.dir
         branch = self.branch
-        if branch:
+        if branch and revision:
             branch += '-'
         return '%(dir)s/%(branch)s%(revision)s' % locals ()
 
@@ -715,7 +716,7 @@
         return self.bzr_pipe ('log --verbose -r-1')
 
 def get_appended_vcs_name (name):
-    return re.search (r"(.*)\.(bzr|git|cvs|svn|darcs|.tar(.gz|.bz2))", name)
+    return re.search (r"(.*)[._](bzr|git|cvs|svn|darcs|tar(.gz|.bz2))", name)
 
 def get_prepended_vcs_name (name):
     return re.search (r"(bzr|git|cvs|svn|darcs):", name)