Commits

Dan Villiom Podlaski Christiansen committed b765c71

Rebased.

  • Participants
  • Parent commits f2ea1c8

Comments (0)

Files changed (15)

advance-phases.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344426357 -7200
 #      Wed Aug 08 13:45:57 2012 +0200
-# Node ID 8960515b3b059c430556b9d38e036b2a8df93a2d
-# Parent  73fd25c42a0d94e985d9b3db069ba78703c297b9
+# Node ID 35c4503278e3ae215ae97e79d0c0be31b2184d2e
+# Parent  1c0b772fca142a72c5a0aa7a47f2255dd4ad6aae
 mark pulled changesets as public (using phases, introduced in Mercurial 2.1)
 
 diff --git a/perfarce.py b/perfarce.py
  from mercurial import revset
  from mercurial import templatekw
  
-@@ -1290,6 +1296,9 @@ def pull(original, ui, repo, source=None
+@@ -1294,6 +1300,9 @@ def pull(original, ui, repo, source=None
              p4rev = repo.commitctx(ctx)
              ctx = repo[p4rev]
  
              for l in client.labels(c):
                  tags[l] = (c, ctx.hex())
  
-@@ -1332,6 +1341,9 @@ def pull(original, ui, repo, source=None
+@@ -1336,6 +1345,9 @@ def pull(original, ui, repo, source=None
                  ctx = repo[p4rev]
                  ui.note(_('added changeset %d:%s\n') % (ctx.rev(), ctx))
  

drop-fstat-progress.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324407363 -3600
 #      Tue Dec 20 19:56:03 2011 +0100
-# Node ID 988794d993f8d163037463cd8505c5c70a2c0812
-# Parent  f7504d28d9e7b9ff3143f062d61e3c31f666db94
+# Node ID 924f6455c3950a133599a22be858a800cc173979
+# Parent c276bb6624484ec75471a52be48220148d66f3b4
 drop indeterminate progress for fstat - it's too spammy
 
 diff --git a/perfarce.py b/perfarce.py
  
 -        if hasattr(self.ui, 'progress'):
 -            self.ui.progress('p4 fstat', None)
-         self.ui.note('%d files \n' % len(result))
+         self.ui.note(_('%d files \n') % len(result))
  
          return result

drop-mercurial-node-id.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1325509599 -3600
 #      Mon Jan 02 14:06:39 2012 +0100
-# Node ID 938de92ef072e59d52362c7752a50a6470b59bb6
-# Parent  488697b978f6dca6776a22eadb32f728c62c6160
+# Node ID bb54cf32c302bf4e34c669460544d38300d3ed23
+# Parent  7e9ac3154173cef908836cdd6c5c885208e07633
 don't include the Mercurial node ID in Perforce changelists
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1095,7 +1095,7 @@ class p4client(object):
+@@ -1099,7 +1099,7 @@ class p4client(object):
              h = []
          h.append(repo[nodes[-1]].hex())
  
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344426233 -7200
 #      Wed Aug 08 13:43:53 2012 +0200
-# Node ID 391e6aacabe88db5f764fda0086808e09388660c
-# Parent  d13b8a1e1f93d6e1c54d1054404992ea74b0334d
+# Node ID 352cad7646e25bc2b36a07be7dc02b8c93769e34
+# Parent  d1b40b64785d1a9304548c64b79fa24913526a2f
 swallow slightly fewer exceptions
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -944,6 +944,7 @@ class p4client(object):
+@@ -948,6 +948,7 @@ class p4client(object):
              if ui.traceback:ui.traceback()
              return True, original(ui, repo, *(source and [source] or []), **opts)
          except p4badclient,e:

fallbackencoding.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1325509589 -3600
 #      Mon Jan 02 14:06:29 2012 +0100
-# Node ID 488697b978f6dca6776a22eadb32f728c62c6160
-# Parent 449f2fb12c1e4ceb93627f96e475eec22e768b60
+# Node ID 7e9ac3154173cef908836cdd6c5c885208e07633
+# Parent  4bde402b61ce6a78703af2a0d2d1ee691483bbbd
 add support for a fallback encoding
 
 diff --git a/perfarce.py b/perfarce.py
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344426231 -7200
 #      Wed Aug 08 13:43:51 2012 +0200
-# Node ID d13b8a1e1f93d6e1c54d1054404992ea74b0334d
-# Parent  2cb680f1dcfe55f2f236037f4c2268d18eb5a8ee
+# Node ID d1b40b64785d1a9304548c64b79fa24913526a2f
+# Parent  50ddca34fa8eef4ac8e97b812e84e32f37c2db91
 add support for using a filemap for inclusion and/or exclusion
 
 Due to the use of bare 'sync' for fetching changelists, we still fetch
      def find(self, rev=None, base=False, p4rev=None, abort=True):
          '''Find the most recent revision which has the p4 extra data which
          gives the p4 changelist it was converted from. If base is True then
-@@ -568,7 +583,7 @@ class p4client(object):
+@@ -572,7 +587,7 @@ class p4client(object):
          if not path.startswith(self.rootpart):
              raise util.Abort(_('invalid p4 local path %s') % path)
  
  
      def localpath(self, path):
          'Convert a path relative to the hg root to a path in the p4 workarea'
-@@ -722,7 +737,9 @@ class p4client(object):
+@@ -726,7 +741,9 @@ class p4client(object):
          if local and files:
              r.files = []
              for d in self.run('where', files=[f for f in files]):
  
          return r
  
-@@ -748,6 +765,8 @@ class p4client(object):
+@@ -752,6 +769,8 @@ class p4client(object):
                  continue
              else:
                  lf = self.repopath(d['clientFile'])
                  df = d['depotFile']
                  rv = d['headRev']
                  tp = d['headType']
-@@ -1363,6 +1382,7 @@ def clone(original, ui, source, dest=Non
+@@ -1367,6 +1386,7 @@ def clone(original, ui, source, dest=Non
          fp.write("keep = %s\n" % client.keep)
          fp.write("lowercasepaths = %s\n" % client.lowercasepaths)
          fp.write("tags = %s\n" % client.tags)

helpful-comment.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344426375 -7200
 #      Wed Aug 08 13:46:15 2012 +0200
-# Node ID c220e59f22c20955ea0622022bdfd37596afe077
-# Parent  8960515b3b059c430556b9d38e036b2a8df93a2d
+# Node ID 8d37dd8778d5e2f3d996380357577d269684b212
+# Parent  35c4503278e3ae215ae97e79d0c0be31b2184d2e
 add a possibly helpful comment
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1262,6 +1262,7 @@ def pull(original, ui, repo, source=None
+@@ -1266,6 +1266,7 @@ def pull(original, ui, repo, source=None
                          cl.desc = cl.desc[:-2]
                      client.change(c, cl.desc, update=True)
              else:
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344426261 -7200
 #      Wed Aug 08 13:44:21 2012 +0200
-# Node ID bf2e2fd903f51b684b47f60a051b7b79058d537c
-# Parent  391e6aacabe88db5f764fda0086808e09388660c
+# Node ID ebf10ce77acc674127d8c5376988e5f2979fa69c
+# Parent  352cad7646e25bc2b36a07be7dc02b8c93769e34
 add locking during pull
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -1211,6 +1211,8 @@ def pull(original, ui, repo, source=None
+@@ -1215,6 +1215,8 @@ def pull(original, ui, repo, source=None
      trim = ui.configbool('perfarce', 'pull_trim_log', False)
  
      try:
          for i, c in enumerate(changes, start=1):
              ui.note(_('change %s\n') % c)
              cl = client.describe(c)
-@@ -1291,34 +1293,46 @@ def pull(original, ui, repo, source=None
+@@ -1295,34 +1297,46 @@ def pull(original, ui, repo, source=None
              ui.note(_('added changeset %d:%s\n') % (ctx.rev(), ctx))
  
      finally:

mercurial-2.3.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344428149 -7200
 #      Wed Aug 08 14:15:49 2012 +0200
-# Node ID c8ba8181d79262870a04263f53d3e5ad8965f57f
-# Parent  c220e59f22c20955ea0622022bdfd37596afe077
+# Node ID ddbf931b306a96354591716d7e67a941c39fdde5
+# Parent  8d37dd8778d5e2f3d996380357577d269684b212
 add support for Mercurial 2.3
 
 diff --git a/perfarce.py b/perfarce.py

pull-progress.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324483279 -3600
 #      Wed Dec 21 17:01:19 2011 +0100
-# Node ID 5e686a2457af0d847b02b42fc6f7afa5948ee0b2
-# Parent  d652514e8a8d6d5b4c3bbaaf59602076b849d853
+# Node ID 35a9e2e12dee685ace8c1e4c5363779626adf372
+# Parent  cbf59bdc940e5c39be910d18bf296f02892f5e4d
 show progress output for pull
 
 diff --git a/perfarce.py b/perfarce.py
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324546908 -3600
 #      Thu Dec 22 10:41:48 2011 +0100
-# Node ID 782c9f2789f69b84bdc5555174fb68bca316eb24
-# Parent  5e686a2457af0d847b02b42fc6f7afa5948ee0b2
+# Node ID 4bde402b61ce6a78703af2a0d2d1ee691483bbbd
+# Parent  35a9e2e12dee685ace8c1e4c5363779626adf372
 write changes pulled to the console
 
 loosely inspired by hgsubversion

push-like-hgsubversion.diff

 # HG changeset patch
-# Parent 93cef98aff4f2b3266279552f8d7d5b8cc865358
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
+# Date 1372321667 -7200
+#      Thu Jun 27 10:27:47 2013 +0200
+# Node ID 1355dee7a8747351a689f533bcab03fb89b7186e
+# Parent  ddbf931b306a96354591716d7e67a941c39fdde5
 push it like hgsubversion
 
 diff --git a/perfarce.py b/perfarce.py

revset+templatekw.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1344426286 -7200
 #      Wed Aug 08 13:44:46 2012 +0200
-# Node ID 73fd25c42a0d94e985d9b3db069ba78703c297b9
-# Parent  bf2e2fd903f51b684b47f60a051b7b79058d537c
+# Node ID 1c0b772fca142a72c5a0aa7a47f2255dd4ad6aae
+# Parent  ebf10ce77acc674127d8c5376988e5f2979fa69c
 add a revset and a template keyword
 
 diff --git a/perfarce.py b/perfarce.py
  try:
      # Mercurial 2.3
      from mercurial import peer
-@@ -1755,6 +1758,26 @@ def identify(ui, repo, *args, **opts):
+@@ -1759,6 +1762,26 @@ def identify(ui, repo, *args, **opts):
  
      ui.write("%s\n" % ' '.join(output))
  
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1337332659 -7200
 #      Fri May 18 11:17:39 2012 +0200
-# Node ID 2cb680f1dcfe55f2f236037f4c2268d18eb5a8ee
-# Parent  938de92ef072e59d52362c7752a50a6470b59bb6
+# Node ID 50ddca34fa8eef4ac8e97b812e84e32f37c2db91
+# Parent  bb54cf32c302bf4e34c669460544d38300d3ed23
 add support for skipping certain changesets
 
 diff --git a/perfarce.py b/perfarce.py
 --- a/perfarce.py
 +++ b/perfarce.py
-@@ -957,10 +957,12 @@ class p4client(object):
+@@ -961,10 +961,12 @@ class p4client(object):
          else:
              p4cmd = 'changes -s submitted -L %s' % p4cset
  

sync-progress.diff

 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1324407363 -3600
 #      Tue Dec 20 19:56:03 2011 +0100
-# Node ID d652514e8a8d6d5b4c3bbaaf59602076b849d853
-# Parent  988794d993f8d163037463cd8505c5c70a2c0812
+# Node ID cbf59bdc940e5c39be910d18bf296f02892f5e4d
+# Parent  924f6455c3950a133599a22be858a800cc173979
 suppress progress for sync for small changelists
 
 ...and then display it for every change if need be