Patchwork [16,of,24] largefiles: upload files in sorted order

login
register
mail settings
Submitter Mads Kiilerich
Date Dec. 16, 2012, 10:34 p.m.
Message ID <998b984fd3463b81c383.1355697251@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/140/
State Accepted
Commit de685145f5c26eb84bd9850031e3b5793eb156bb
Headers show

Comments

Mads Kiilerich - Dec. 16, 2012, 10:34 p.m.
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1355276294 -3600
# Node ID 998b984fd3463b81c38370e003602f0b16a887d5
# Parent  f51f3f8ad6d9f5f18d03ced1a25b9296325d5040
largefiles: upload files in sorted order
Bryan O'Sullivan - Dec. 17, 2012, 9:01 p.m.
On Sun, Dec 16, 2012 at 2:34 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> largefiles: upload files in sorted order
>

Looks good, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121217/34bd2756/attachment.html>

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -995,7 +995,7 @@ 
                     files.add(f)
         toupload = toupload.union(
             set([f for f in files if lfutil.isstandin(f) and f in ctx]))
-    return toupload
+    return sorted(toupload)
 
 def overrideoutgoing(orig, ui, repo, dest=None, **opts):
     result = orig(ui, repo, dest, **opts)
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -694,9 +694,9 @@ 
   
   searching for changes
   largefiles to upload:
+  foo
+  large
   large8
-  large
-  foo
   
   $ cd ../a