# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Date 1231033008 -3600
# Node ID 3b2383c9003489b177a45b3562f673a8d9ababe8
# Parent  3742981341c1fe56b3360c926644ce85dd17269f
convert/gnuarch: use fully qualified revisions

There is no need loosing information in the conversion process. This could
lead to wrong shamap mappings if different archives used the same 'version'
naming.

diff -r 3742981341c1 -r 3b2383c90034 hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py	Sun Jan 04 02:36:48 2009 +0100
+++ b/hgext/convert/gnuarch.py	Sun Jan 04 02:36:48 2009 +0100
@@ -66,7 +66,7 @@
 
         # Generate parents dictionary
         child = []
-        output, status = self.runlines('revisions', self.treeversion)
+        output, status = self.runlines('revisions', '-f', self.treeversion)
         self.checkexit(status, 'archive registered?')
         for l in output:
             rev = l.strip()
@@ -156,14 +156,13 @@
         return os.system(cmdline)
 
     def _update(self, rev):
-        if rev == 'base-0':
+        if rev[-6:] == 'base-0':
             # Initialise 'base-0' revision
             self._obtainrevision(rev)
         else:
             self.ui.debug(_('applying revision %s...\n') % rev)
-            revision = '%s--%s' % (self.treeversion, rev)
             changeset, status = self.runlines('replay', '-d', self.tmppath,
-                                              revision)
+                                              rev)
             if status:
                 # Something went wrong while merging (baz or tla
                 # issue?), get latest revision and try from there
@@ -221,8 +220,7 @@
 
     def _obtainrevision(self, rev):
         self.ui.debug(_('obtaining revision %s...\n') % rev)
-        revision = '%s--%s' % (self.treeversion, rev)
-        output = self._execute('get', revision, self.tmppath)
+        output = self._execute('get', rev, self.tmppath)
         self.checkexit(output)
         self.ui.debug(_('analysing revision %s...\n') % rev)
         files = self._readcontents(self.tmppath)