Patchwork treemanifest: use "cp xyz/." instead of "cp xyz/*"

login
register
mail settings
Submitter Tony Tung
Date Feb. 24, 2016, 12:43 a.m.
Message ID <EE64DAF5-3F54-4085-B9BE-D3D0B0321313@instagram.com>
Download mbox | patch
Permalink /patch/13334/
State Superseded
Commit 408446e4b10c4af11c39c97caa61565c3f86754e
Headers show

Comments

Tony Tung - Feb. 24, 2016, 12:43 a.m.
The difference doesn’t cause any problems, because there are no hidden files.  However, this better matches the original intent, which was cp -T.

Furthermore, as we know code will be infinitely copy-pasted, we might as well get it right so future copy-pasters will get it right. :)

I’ll search for the other file.

Thanks,
Tony

On Feb 23, 2016, at 5:52 AM, Martin von Zweigbergk <martinvonz@google.com<mailto:martinvonz@google.com>> wrote:


Did the difference cause you any problems? Either way, could you name the same change to the other file (I forgot which) that does a similar backup of .hg/store/?

On Mon, Feb 22, 2016, 23:15 Tony Tung <ttung@fb.com<mailto:ttung@fb.com>> wrote:
# HG changeset patch
# User Tony Tung <tonytung@merly.org<mailto:tonytung@merly.org>>
# Date 1456211598 28800
#      Mon Feb 22 23:13:18 2016 -0800
# Node ID 9a30df378101e038bf7493fc27cf9c421de16d61
# Parent  91a827e760df9d9b3d86692c5aa195a3d6ba2208
treemanifest: use "cp xyz/." instead of "cp xyz/*"

This is more similar to cp -T because it covers hidden files.

_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org<mailto:Mercurial-devel@mercurial-scm.org>
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel<https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=CwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=TfAv7WTfloToKdfwSQzVYw&m=BEwhQT4mtwss26JooBYSOidYa_Kk7nN2G8WqNHu0yms&s=M4tV5XY4Ah88ogCmjgz-G5g6vy7CdF3cr2ITMmYqiE8&e=>

Patch

diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t

--- a/tests/test-treemanifest.t

+++ b/tests/test-treemanifest.t

@@ -418,7 +418,7 @@ 

   b/bar/orange/fly/gnat.py (glob)
   b/bar/orange/fly/housefly.txt (glob)
   b/foo/apple/bees/flower.py (glob)
-  $ cp -r .hg/store-copy/* .hg/store

+  $ cp -r .hg/store-copy/. .hg/store


 Test files with just includes and excludes.

@@ -427,7 +427,7 @@ 

   $ rm -r .hg/store/meta/b/foo/apple/bees
   $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
   b/bar/fruits.txt (glob)
-  $ cp -r .hg/store-copy/* .hg/store

+  $ cp -r .hg/store-copy/. .hg/store


 Test files for a subdirectory, excluding a directory within it.

@@ -437,7 +437,7 @@ 

   b/bar/fruits.txt (glob)
   b/bar/orange/fly/gnat.py (glob)
   b/bar/orange/fly/housefly.txt (glob)
-  $ cp -r .hg/store-copy/* .hg/store

+  $ cp -r .hg/store-copy/. .hg/store


 Test files for a sub directory, including only a directory within it, and
 including an unrelated directory.
@@ -447,7 +447,7 @@ 

   $ hg files -r . -I path:b/bar/orange -I path:a b
   b/bar/orange/fly/gnat.py (glob)
   b/bar/orange/fly/housefly.txt (glob)
-  $ cp -r .hg/store-copy/* .hg/store

+  $ cp -r .hg/store-copy/. .hg/store


 Test files for a pattern, including a directory, and excluding a directory
 within that.
@@ -457,7 +457,7 @@ 

   $ rm -r .hg/store/meta/b/bar/orange
   $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
   b/bar/fruits.txt (glob)
-  $ cp -r .hg/store-copy/* .hg/store

+  $ cp -r .hg/store-copy/. .hg/store


 Add some more changes to the deep repo
   $ echo narf >> b/bar/fruits.txt