Commits

Dan Villiom Podlaski Christiansen committed 0bb86ed

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 7e7f4168a5df6793b5d4f9f8942b341ddc0c391f
-# Parent  21ce6eaad356de4164c8f3f3d61798291dd5e431
+# Node ID 7ceac5f87f645266159915a673843ca0538a3071
+# Parent  7f48e1f5157d8ae2c50193281f2c6ee10a3048d8
 drop indeterminate progress for fstat - it's too spammy
 
 diff --git a/perfarce.py b/perfarce.py

drop-mercurial-node-id.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1325509599 -3600
-# Node ID 3c5eee313da4c9d6e6e79c3ecbded15502f406ee
-# Parent  32601855e650532ed0f40402933ed0197e981ccd
+# Node ID 2bfe8a7681b2b4475ee7ad4f5593178418abf4e6
+# Parent 24690b94bed9bd42c004b38d81aefcde6221359e
+don't include the Mercurial node ID in Perforce changelists
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1015,7 +1015,7 @@ class p4client(object):
+@@ -1031,7 +1031,7 @@ class p4client(object):
              h = []
          h.append(repo[nodes[-1]].hex())
  

fallbackencoding.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1325509589 -3600
-# Node ID 32601855e650532ed0f40402933ed0197e981ccd
-# Parent  9317e701b526b7ea8e51c18a13b1d6d3f1b7209e
+# Node ID 24690b94bed9bd42c004b38d81aefcde6221359e
+# Parent ff5746df42022b868f6cb72694ec7212c2ab6b55
+add support for a fallback encoding
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py

pull-progress.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324483279 -3600
-# Node ID 9a69222ead9a1b947da445c940c315b42d996708
-# Parent  9f09ab5acbe4a82a1e91ac68812663b6232ec7f6
+# Node ID cebea4ff2ed64dc2cac6e1f30f9245c43d24463c
+# Parent  56998d8a4ced20718322c525429d4b76c66df70d
 show progress output for pull
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1081,11 +1081,16 @@ def pull(original, ui, repo, source=None
+@@ -1097,11 +1097,16 @@ def pull(original, ui, repo, source=None
      tags = {}
  
      try:
              if client.keep:
                  if startrev:
                      client.sync(c, all=True, force=True)
-@@ -1094,6 +1099,11 @@ def pull(original, ui, repo, source=None
+@@ -1110,6 +1115,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]
-@@ -1139,6 +1149,9 @@ def pull(original, ui, repo, source=None
+@@ -1155,6 +1165,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 9317e701b526b7ea8e51c18a13b1d6d3f1b7209e
-# Parent  9a69222ead9a1b947da445c940c315b42d996708
+# Node ID ff5746df42022b868f6cb72694ec7212c2ab6b55
+# Parent  cebea4ff2ed64dc2cac6e1f30f9245c43d24463c
 write changes pulled to the console
 
 loosely inspired by hgsubversion
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1086,6 +1086,12 @@ def pull(original, ui, repo, source=None
+@@ -1102,6 +1102,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 9f09ab5acbe4a82a1e91ac68812663b6232ec7f6
-# Parent  7e7f4168a5df6793b5d4f9f8942b341ddc0c391f
+# Node ID 56998d8a4ced20718322c525429d4b76c66df70d
+# Parent  7ceac5f87f645266159915a673843ca0538a3071
 suppress progress for sync for small changelists
 
 ...and then display it for every change if need be