Commits

Dan Villiom Podlaski Christiansen committed 92519a5

Rebased.

Comments (0)

Files changed (6)

drop-fstat-progress.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324407363 -3600
-# Node ID 7ceac5f87f645266159915a673843ca0538a3071
-# Parent  7f48e1f5157d8ae2c50193281f2c6ee10a3048d8
+# Node ID 6973e601e2c783ddd507552fcec9d7bb2521bd1f
+# Parent  5a6b061a9f3f2f508f2dd8c55f976ff89bda762e
 drop indeterminate progress for fstat - it's too spammy
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -670,13 +670,6 @@ class p4client(object):
+@@ -672,13 +672,6 @@ class p4client(object):
              p4cmd = 'fstat -e %d %s' % (change, util.shellquote('%s...' % self.partial))
  
          for d in self.run(p4cmd):
              if 'desc' in d or d['clientFile'].startswith('.hg'):
                  continue
              else:
-@@ -687,8 +680,6 @@ class p4client(object):
+@@ -689,8 +682,6 @@ class p4client(object):
                  ac = d['headAction']
                  result.append((df, int(rv), tp, self.actions[ac], lf))
  

drop-mercurial-node-id.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1325509599 -3600
-# Node ID 2bfe8a7681b2b4475ee7ad4f5593178418abf4e6
-# Parent 24690b94bed9bd42c004b38d81aefcde6221359e
+# Node ID caa16cc7fb938ab7a7cb1daa7db2125140f18507
+# Parent  21fda29e24bc649eb33300c7d6905862808daa16
 don't include the Mercurial node ID in Perforce changelists
 
 diff --git a/perfarce.py b/perfarce.py
 -        desc='\n* * *\n'.join(desc) + '\n\n{{mercurial %s}}\n' % (':'.join(h))
 +        desc='\n* * *\n'.join(desc)
  
-         return False, (client, p4rev, p4id, nodes, ctx2, desc, mod, add, rem, cpy)
- 
+         if ui.debugflag:
+             ui.debug('mod = %r\n' % (mod,))

fallbackencoding.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1325509589 -3600
-# Node ID 24690b94bed9bd42c004b38d81aefcde6221359e
-# Parent ff5746df42022b868f6cb72694ec7212c2ab6b55
+# Node ID 21fda29e24bc649eb33300c7d6905862808daa16
+# Parent  3068ed97e4ae38e04aa9d5dd43dba5a53466956b
 add support for a fallback encoding
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -183,6 +183,8 @@ class p4client(object):
+@@ -185,6 +185,8 @@ class p4client(object):
                  self.encoding = emap.get(e,e)
              else:
                  self.encoding = ui.config('perfarce', 'encoding', None)
  
              # caches
              self.clientspec = {}
-@@ -346,9 +348,21 @@ class p4client(object):
+@@ -348,9 +350,21 @@ class p4client(object):
  
          if self.encoding:
              try:

pull-progress.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324483279 -3600
-# Node ID cebea4ff2ed64dc2cac6e1f30f9245c43d24463c
-# Parent  56998d8a4ced20718322c525429d4b76c66df70d
+# Node ID 6844d323729ed9af973cd7b527347a2833fc9a0e
+# Parent  008cddcf8a55ce8686186e771b626ae30f245c25
 show progress output for pull
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1097,11 +1097,16 @@ def pull(original, ui, repo, source=None
+@@ -1103,11 +1103,16 @@ def pull(original, ui, repo, source=None
      tags = {}
  
      try:
              if client.keep:
                  if startrev:
                      client.sync(c, all=True, force=True)
-@@ -1110,6 +1115,11 @@ def pull(original, ui, repo, source=None
+@@ -1116,6 +1121,11 @@ def pull(original, ui, repo, source=None
                                  abort=False)
                      client.sync(c, force=True, files=[f[0] for f in files])
  
              nodes = client.parsenodes(cl.desc)
              if nodes:
                  parent = nodes[-1]
-@@ -1155,6 +1165,9 @@ def pull(original, ui, repo, source=None
+@@ -1161,6 +1171,9 @@ def pull(original, ui, repo, source=None
              ui.note(_('added changeset %d:%s\n') % (ctx.rev(), ctx))
  
      finally:
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324546908 -3600
-# Node ID ff5746df42022b868f6cb72694ec7212c2ab6b55
-# Parent  cebea4ff2ed64dc2cac6e1f30f9245c43d24463c
+# Node ID 3068ed97e4ae38e04aa9d5dd43dba5a53466956b
+# Parent  6844d323729ed9af973cd7b527347a2833fc9a0e
 write changes pulled to the console
 
 loosely inspired by hgsubversion
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1102,6 +1102,12 @@ def pull(original, ui, repo, source=None
+@@ -1108,6 +1108,12 @@ def pull(original, ui, repo, source=None
              cl = client.describe(c)
              files = client.fstat(c, all=bool(startrev))
  

sync-progress.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324407363 -3600
-# Node ID 56998d8a4ced20718322c525429d4b76c66df70d
-# Parent  7ceac5f87f645266159915a673843ca0538a3071
+# Node ID 008cddcf8a55ce8686186e771b626ae30f245c25
+# Parent  6973e601e2c783ddd507552fcec9d7bb2521bd1f
 suppress progress for sync for small changelists
 
 ...and then display it for every change if need be
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -702,9 +702,8 @@ class p4client(object):
+@@ -704,9 +704,8 @@ class p4client(object):
          n = 0
          for d in self.run(cmd, files=[("%s@%d" % (os.path.join(self.partial, f), change)) for f in files], abort=False):
              n += 1
              code = d.get('code')
              if code == 'error':
                  data = d['data'].strip()
-@@ -713,7 +712,7 @@ class p4client(object):
+@@ -715,7 +714,7 @@ class p4client(object):
                  else:
                      raise util.Abort('p4: %s' % data)