Mercurial > hg
annotate tests/test-subrepo-git.t @ 34146:9e4f82bc2b0b
scmutil: don't append .orig to backups in origbackuppath (BC)
When ui.origbackuppath is set, .orig files are stored outside of the working
copy, however they still have a .orig suffix appended to them. This can cause
unexpected conflicts, particularly when tracked files or directories have .orig
at the end.
This change removes the .orig suffix from files stored in an out-of-tree
origbackuppath.
Test Plan:
Update and run unit tests.
Differential Revision: https://phab.mercurial-scm.org/D679
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 11 Sep 2017 17:49:49 +0000 |
parents | 3fee7f7d2da0 |
children | eb586ed5d8ce |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
21751
diff
changeset
|
1 #require git |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
2 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
3 make git commits repeatable |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
4 |
32413
d6be5b5cc325
test: prepare tests for removing date aliases
Boris Feld <boris.feld@octobus.net>
parents:
30062
diff
changeset
|
5 $ cat >> $HGRCPATH <<EOF |
d6be5b5cc325
test: prepare tests for removing date aliases
Boris Feld <boris.feld@octobus.net>
parents:
30062
diff
changeset
|
6 > [defaults] |
d6be5b5cc325
test: prepare tests for removing date aliases
Boris Feld <boris.feld@octobus.net>
parents:
30062
diff
changeset
|
7 > commit = -d "0 0" |
d6be5b5cc325
test: prepare tests for removing date aliases
Boris Feld <boris.feld@octobus.net>
parents:
30062
diff
changeset
|
8 > EOF |
d6be5b5cc325
test: prepare tests for removing date aliases
Boris Feld <boris.feld@octobus.net>
parents:
30062
diff
changeset
|
9 |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
10 $ echo "[core]" >> $HOME/.gitconfig |
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
11 $ echo "autocrlf = false" >> $HOME/.gitconfig |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
12 $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
13 $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
14 $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
15 $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
16 $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
17 $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE |
23693
9a02f7517939
test-subrepo-git: ignore global git config
Matt Mackall <mpm@selenic.com>
parents:
23678
diff
changeset
|
18 $ GIT_CONFIG_NOSYSTEM=1; export GIT_CONFIG_NOSYSTEM |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
19 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
20 root hg repo |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
21 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
22 $ hg init t |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
23 $ cd t |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
24 $ echo a > a |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
25 $ hg add a |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
26 $ hg commit -m a |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
27 $ cd .. |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
28 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
29 new external git repo |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
30 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
31 $ mkdir gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
32 $ cd gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
33 $ git init -q |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
34 $ echo g > g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
35 $ git add g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
36 $ git commit -q -m g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
37 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
38 add subrepo clone |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
39 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
40 $ cd ../t |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
41 $ echo 's = [git]../gitroot' > .hgsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
42 $ git clone -q ../gitroot s |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
43 $ hg add .hgsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
44 $ hg commit -m 'new git subrepo' |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
45 $ hg debugsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
46 path s |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
47 source ../gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
48 revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
49 |
12995
d90fc91c8377
subrepo: update and merge works with any git branch
Eric Eisner <ede@mit.edu>
parents:
12994
diff
changeset
|
50 record a new commit from upstream from a different branch |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
51 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
52 $ cd ../gitroot |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
53 $ git checkout -q -b testing |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
54 $ echo gg >> g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
55 $ git commit -q -a -m gg |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
56 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
57 $ cd ../t/s |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
58 $ git pull -q >/dev/null 2>/dev/null |
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
59 $ git checkout -q -b testing origin/testing >/dev/null |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
60 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
61 $ cd .. |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
62 $ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
63 M s/g |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
64 $ hg commit -m 'update git subrepo' |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
65 $ hg debugsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
66 path s |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
67 source ../gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
68 revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
69 |
13092
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
70 make $GITROOT pushable, by replacing it with a clone with nothing checked out |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
71 |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
72 $ cd .. |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
73 $ git clone gitroot gitrootbare --bare -q |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
74 $ rm -rf gitroot |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
75 $ mv gitrootbare gitroot |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
76 |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
77 clone root |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
78 |
13092
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
79 $ cd t |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
80 $ hg clone . ../tc 2> /dev/null |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
81 updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
82 cloning subrepo s from $TESTTMP/gitroot |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
83 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
84 $ cd ../tc |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
85 $ hg debugsub |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
86 path s |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
87 source ../gitroot |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
88 revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
89 |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
90 update to previous substate |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
91 |
13111
560b8001f765
subrepo: silence git output when ui.quiet is set
Eric Eisner <ede@mit.edu>
parents:
13092
diff
changeset
|
92 $ hg update 1 -q |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
93 $ cat s/g |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
94 g |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
95 $ hg debugsub |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
96 path s |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
97 source ../gitroot |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
98 revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
99 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
100 clone root, make local change |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
101 |
13092
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
102 $ cd ../t |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
103 $ hg clone . ../ta 2> /dev/null |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
104 updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
105 cloning subrepo s from $TESTTMP/gitroot |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
106 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
107 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
108 $ cd ../ta |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
109 $ echo ggg >> s/g |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
110 $ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
111 M s/g |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
112 $ hg diff --subrepos |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
113 diff --git a/s/g b/s/g |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
114 index 089258f..85341ee 100644 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
115 --- a/s/g |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
116 +++ b/s/g |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
117 @@ -1,2 +1,3 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
118 g |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
119 gg |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
120 +ggg |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
14481
diff
changeset
|
121 $ hg commit --subrepos -m ggg |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
122 committing subrepository s |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
123 $ hg debugsub |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
124 path s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
125 source ../gitroot |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
126 revision 79695940086840c99328513acbe35f90fcd55e57 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
127 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
128 clone root separately, make different local change |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
129 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
130 $ cd ../t |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
131 $ hg clone . ../tb 2> /dev/null |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
132 updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
133 cloning subrepo s from $TESTTMP/gitroot |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
134 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
135 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
136 $ cd ../tb/s |
23411
2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
22590
diff
changeset
|
137 $ hg status --subrepos |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
138 $ echo f > f |
23411
2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
22590
diff
changeset
|
139 $ hg status --subrepos |
2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
22590
diff
changeset
|
140 ? s/f |
23963
8f02682ff3b0
subrepo: don't abort in add when non-hg subrepos are present (issue4513)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23938
diff
changeset
|
141 $ hg add . |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
142 adding f |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
143 $ git add f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
144 $ cd .. |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
145 |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
146 $ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
147 A s/f |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
14481
diff
changeset
|
148 $ hg commit --subrepos -m f |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
149 committing subrepository s |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
150 $ hg debugsub |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
151 path s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
152 source ../gitroot |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
153 revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
154 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
155 user b push changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
156 |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
157 $ hg push 2>/dev/null |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
158 pushing to $TESTTMP/t (glob) |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
159 pushing branch testing of subrepository "s" |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
160 searching for changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
161 adding changesets |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
162 adding manifests |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
163 adding file changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
164 added 1 changesets with 1 changes to 1 files |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
165 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
166 user a pulls, merges, commits |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
167 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
168 $ cd ../ta |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
169 $ hg pull |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
170 pulling from $TESTTMP/t (glob) |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
171 searching for changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
172 adding changesets |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
173 adding manifests |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
174 adding file changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
175 added 1 changesets with 1 changes to 1 files (+1 heads) |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
176 (run 'hg heads' to see heads, 'hg merge' to merge) |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
177 $ hg merge 2>/dev/null |
21401
2c364f7801c8
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21024
diff
changeset
|
178 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
30060
diff
changeset
|
179 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m |
13569
3ab3b892d223
subrepo: show the source that git pulls
Eric Eisner <ede@mit.edu>
parents:
13560
diff
changeset
|
180 pulling subrepo s from $TESTTMP/gitroot |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
181 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
182 (branch merge, don't forget to commit) |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
183 $ hg st --subrepos s |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
184 A s/f |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
185 $ cat s/f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
186 f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
187 $ cat s/g |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
188 g |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
189 gg |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
190 ggg |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
14481
diff
changeset
|
191 $ hg commit --subrepos -m 'merge' |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
192 committing subrepository s |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
193 $ hg status --subrepos --rev 1:5 |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
194 M .hgsubstate |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
195 M s/g |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
196 A s/f |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
197 $ hg debugsub |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
198 path s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
199 source ../gitroot |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
200 revision f47b465e1bce645dbf37232a00574aa1546ca8d3 |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
201 $ hg push 2>/dev/null |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
202 pushing to $TESTTMP/t (glob) |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
203 pushing branch testing of subrepository "s" |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
204 searching for changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
205 adding changesets |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
206 adding manifests |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
207 adding file changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
208 added 2 changesets with 2 changes to 1 files |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
209 |
13029 | 210 make upstream git changes |
211 | |
212 $ cd .. | |
213 $ git clone -q gitroot gitclone | |
214 $ cd gitclone | |
215 $ echo ff >> f | |
216 $ git commit -q -a -m ff | |
217 $ echo fff >> f | |
218 $ git commit -q -a -m fff | |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
219 $ git push origin testing 2>/dev/null |
13029 | 220 |
221 make and push changes to hg without updating the subrepo | |
222 | |
223 $ cd ../t | |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
224 $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.' |
13029 | 225 updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
226 cloning subrepo s from $TESTTMP/gitroot |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
227 checking out detached HEAD in subrepository "s" |
13029 | 228 check out a git branch if you intend to make changes |
229 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
230 $ cd ../td | |
231 $ echo aa >> a | |
232 $ hg commit -m aa | |
233 $ hg push | |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
234 pushing to $TESTTMP/t (glob) |
13029 | 235 searching for changes |
236 adding changesets | |
237 adding manifests | |
238 adding file changes | |
239 added 1 changesets with 1 changes to 1 files | |
240 | |
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
241 sync to upstream git, distribute changes |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
242 |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
243 $ cd ../ta |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
244 $ hg pull -u -q |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
245 $ cd s |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
246 $ git pull -q >/dev/null 2>/dev/null |
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
247 $ cd .. |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
248 $ hg commit -m 'git upstream sync' |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
249 $ hg debugsub |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
250 path s |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
251 source ../gitroot |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
252 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
253 $ hg push -q |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
254 |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
255 $ cd ../tb |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
256 $ hg pull -q |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
257 $ hg update 2>/dev/null |
13569
3ab3b892d223
subrepo: show the source that git pulls
Eric Eisner <ede@mit.edu>
parents:
13560
diff
changeset
|
258 pulling subrepo s from $TESTTMP/gitroot |
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
259 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
260 $ hg debugsub |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
261 path s |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
262 source ../gitroot |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
263 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
264 |
19013
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
265 create a new git branch |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
266 |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
267 $ cd s |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
268 $ git checkout -b b2 |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
269 Switched to a new branch 'b2' |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
270 $ echo a>a |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
271 $ git add a |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
272 $ git commit -qm 'add a' |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
273 $ cd .. |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
274 $ hg commit -m 'add branch in s' |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
275 |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
276 pulling new git branch should not create tracking branch named 'origin/b2' |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
277 (issue3870) |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
278 $ cd ../td/s |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
279 $ git remote set-url origin $TESTTMP/tb/s |
19049
2e5476980a57
subrepo: fix test breakage introduced in 2b34d004e644
Kevin Bullock <kbullock@ringworld.org>
parents:
19013
diff
changeset
|
280 $ git branch --no-track oldtesting |
19013
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
281 $ cd .. |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
282 $ hg pull -q ../tb |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
283 $ hg up |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
284 From $TESTTMP/tb/s |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
285 * [new branch] b2 -> origin/b2 |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
286 Previous HEAD position was f47b465... merge |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
287 Switched to a new branch 'b2' |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
288 pulling subrepo s from $TESTTMP/tb/s |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2b34d004e644
subrepo: add regression test for issue3870
Kevin Bullock <kbullock@ringworld.org>
parents:
18109
diff
changeset
|
290 |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
291 update to a revision without the subrepo, keeping the local git repository |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
292 |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
293 $ cd ../t |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
294 $ hg up 0 |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
295 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
13010
6bdae8ea0b48
test-subrepo-git.t: portability fix.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12996
diff
changeset
|
296 $ ls -a s |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
297 . |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
298 .. |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
299 .git |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
300 |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
301 $ hg up 2 |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
302 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13010
6bdae8ea0b48
test-subrepo-git.t: portability fix.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12996
diff
changeset
|
303 $ ls -a s |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
304 . |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
305 .. |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
306 .git |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
307 g |
13027 | 308 |
309 archive subrepos | |
310 | |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
311 $ cd ../tc |
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
312 $ hg pull -q |
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
313 $ hg archive --subrepos -r 5 ../archive 2>/dev/null |
13569
3ab3b892d223
subrepo: show the source that git pulls
Eric Eisner <ede@mit.edu>
parents:
13560
diff
changeset
|
314 pulling subrepo s from $TESTTMP/gitroot |
13027 | 315 $ cd ../archive |
316 $ cat s/f | |
317 f | |
318 $ cat s/g | |
319 g | |
320 gg | |
321 ggg | |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
322 |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
323 $ hg -R ../tc archive --subrepo -r 5 -X ../tc/**f ../archive_x 2>/dev/null |
17114
ca75bd99f740
tests: ignore pax_global_header in test-subrepo-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17108
diff
changeset
|
324 $ find ../archive_x | sort | grep -v pax_global_header |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
325 ../archive_x |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
326 ../archive_x/.hg_archival.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
327 ../archive_x/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
328 ../archive_x/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
329 ../archive_x/a |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
330 ../archive_x/s |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
331 ../archive_x/s/g |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17022
diff
changeset
|
332 |
24953
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24943
diff
changeset
|
333 $ hg -R ../tc archive -S ../archive.tgz --prefix '.' 2>/dev/null |
24964
fc92ccbbeb9a
test-subrepo-git: ignore pax_global_header when listing archive
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24953
diff
changeset
|
334 $ tar -tzf ../archive.tgz | sort | grep -v pax_global_header |
24953
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24943
diff
changeset
|
335 .hg_archival.txt |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24943
diff
changeset
|
336 .hgsub |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24943
diff
changeset
|
337 .hgsubstate |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24943
diff
changeset
|
338 a |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24943
diff
changeset
|
339 s/g |
24924
41cd8171e58f
archive: always use portable path component separators with subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
24902
diff
changeset
|
340 |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
341 create nested repo |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
342 |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
343 $ cd .. |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
344 $ hg init outer |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
345 $ cd outer |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
346 $ echo b>b |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
347 $ hg add b |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
348 $ hg commit -m b |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
349 |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
350 $ hg clone ../t inner 2> /dev/null |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
351 updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
352 cloning subrepo s from $TESTTMP/gitroot |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
353 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
354 $ echo inner = inner > .hgsub |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
355 $ hg add .hgsub |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
356 $ hg commit -m 'nested sub' |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
357 |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
358 nested commit |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
359 |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
360 $ echo ffff >> inner/s/f |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
361 $ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
362 M inner/s/f |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
14481
diff
changeset
|
363 $ hg commit --subrepos -m nested |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
364 committing subrepository inner |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
365 committing subrepository inner/s (glob) |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
366 |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
367 nested archive |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
368 |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
369 $ hg archive --subrepos ../narchive |
13296
5dda6c708138
Ignore pax_global_header that some tar versions write as a file.
Lee Cantey <lcantey@embarcadero.com>
parents:
13182
diff
changeset
|
370 $ ls ../narchive/inner/s | grep -v pax_global_header |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
371 f |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
372 g |
13324
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
373 |
13460
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
374 relative source expansion |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
375 |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
376 $ cd .. |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
377 $ mkdir d |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
378 $ hg clone t d/t 2> /dev/null |
13460
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
379 updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
380 cloning subrepo s from $TESTTMP/gitroot |
13460
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
381 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
382 |
13553
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
383 Don't crash if the subrepo is missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
384 |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
385 $ hg clone t missing -q |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
386 $ cd missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
387 $ rm -rf s |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
388 $ hg status -S |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
389 $ hg sum | grep commit |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
390 commit: 1 subrepos |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
391 $ hg push -q |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
392 abort: subrepo s is missing (in subrepository "s") |
13553
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
393 [255] |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
14481
diff
changeset
|
394 $ hg commit --subrepos -qm missing |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
395 abort: subrepo s is missing (in subrepository "s") |
13553
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
396 [255] |
24902
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
397 |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
398 #if symlink |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
399 Don't crash if subrepo is a broken symlink |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
400 $ ln -s broken s |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
401 $ hg status -S |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
402 $ hg push -q |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
403 abort: subrepo s is missing (in subrepository "s") |
24902
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
404 [255] |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
405 $ hg commit --subrepos -qm missing |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
406 abort: subrepo s is missing (in subrepository "s") |
24902
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
407 [255] |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
408 $ rm s |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
409 #endif |
986a5c23b1c1
util.checkcase: don't abort on broken symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
24778
diff
changeset
|
410 |
20105
c5a0f899e47b
tests: deal with new gits sending status messages to stderr
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
411 $ hg update -C 2> /dev/null |
13560 | 412 cloning subrepo s from $TESTTMP/gitroot |
13553
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
413 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
414 $ hg sum | grep commit |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
415 commit: (clean) |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
416 |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
417 Don't crash if the .hgsubstate entry is missing |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
418 |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
419 $ hg update 1 -q |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
420 $ hg rm .hgsubstate |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
421 $ hg commit .hgsubstate -m 'no substate' |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
422 nothing changed |
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
423 [1] |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
424 $ hg tag -l nosubstate |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
425 $ hg manifest |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
426 .hgsub |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
427 .hgsubstate |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
428 a |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
429 |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
430 $ hg status -S |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
431 R .hgsubstate |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
432 $ hg sum | grep commit |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
433 commit: 1 removed, 1 subrepos (new branch head) |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
434 |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
435 $ hg commit -m 'restore substate' |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
436 nothing changed |
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
437 [1] |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
438 $ hg manifest |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
439 .hgsub |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
440 .hgsubstate |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
441 a |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
442 $ hg sum | grep commit |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
443 commit: 1 removed, 1 subrepos (new branch head) |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
444 |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
445 $ hg update -qC nosubstate |
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
446 $ ls s |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
15531
diff
changeset
|
447 g |
14469
2fdea636f254
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Eric Eisner <ede@alum.mit.edu>
parents:
13553
diff
changeset
|
448 |
15531
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
449 issue3109: false positives in git diff-index |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
450 |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
451 $ hg update -q |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
452 $ touch -t 200001010000 s/g |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
453 $ hg status --subrepos |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
454 $ touch -t 200001010000 s/g |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
455 $ hg sum | grep commit |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
456 commit: (clean) |
0810ccc51f0a
subrepo: fix git status false positive (issue3109)
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
15321
diff
changeset
|
457 |
13324
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
458 Check hg update --clean |
13331
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
459 $ cd $TESTTMP/ta |
13324
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
460 $ echo > s/g |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
461 $ cd s |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
462 $ echo c1 > f1 |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
463 $ echo c1 > f2 |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
464 $ git add f1 |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
465 $ cd .. |
13331
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
466 $ hg status -S |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
467 M s/g |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
468 A s/f1 |
23411
2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
22590
diff
changeset
|
469 ? s/f2 |
13331
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
470 $ ls s |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
471 f |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
472 f1 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
473 f2 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
474 g |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
475 $ hg update --clean |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
476 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
477 $ hg status -S |
23411
2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
22590
diff
changeset
|
478 ? s/f1 |
2d86f4e38c08
subrepo: add status support for ignored files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
22590
diff
changeset
|
479 ? s/f2 |
13331
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
480 $ ls s |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
481 f |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
482 f1 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
483 f2 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
484 g |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
485 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
486 Sticky subrepositories, no changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
487 $ cd $TESTTMP/ta |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
488 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
489 7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
490 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
491 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
492 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
493 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
494 $ hg update 1 > /dev/null 2>&1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
495 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
496 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
497 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
498 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
499 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
500 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
501 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20105
diff
changeset
|
502 Sticky subrepositories, file changes |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
503 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
504 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
505 $ git add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
506 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
507 $ hg id -n |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
17114
diff
changeset
|
508 1+ |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
509 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
510 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
511 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
512 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
513 $ hg update 4 |
21401
2c364f7801c8
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21024
diff
changeset
|
514 subrepository s diverged (local revision: da5f5b1, remote revision: aa84837) |
30060
a145161debed
merge: use labels in subrepo merge
Simon Farnsworth <simonfar@fb.com>
parents:
29328
diff
changeset
|
515 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
516 subrepository sources for s differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
517 use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
518 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
519 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
520 4+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
521 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
522 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
523 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
524 $ cd .. |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
525 $ hg update --clean tip > /dev/null 2>&1 |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
526 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
527 Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
528 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
529 7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
530 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
531 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
532 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
533 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
534 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
535 $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
536 Previous HEAD position was 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
537 HEAD is now at aa84837... f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
538 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
539 $ hg update 1 |
21401
2c364f7801c8
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21024
diff
changeset
|
540 subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) |
30060
a145161debed
merge: use labels in subrepo merge
Simon Farnsworth <simonfar@fb.com>
parents:
29328
diff
changeset
|
541 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
542 subrepository sources for s differ (in checked out version) |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
543 use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
544 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
545 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
546 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
547 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
548 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
549 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
550 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
551 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
552 Sticky subrepository, file changes and revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
553 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
554 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
555 $ git add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
556 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
557 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
558 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
559 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
560 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
561 $ hg update 7 |
21401
2c364f7801c8
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21024
diff
changeset
|
562 subrepository s diverged (local revision: 32a3438, remote revision: 32a3438) |
30060
a145161debed
merge: use labels in subrepo merge
Simon Farnsworth <simonfar@fb.com>
parents:
29328
diff
changeset
|
563 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
564 subrepository sources for s differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
565 use (l)ocal source (32a3438) or (r)emote source (32a3438)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
566 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
567 $ hg id -n |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
17114
diff
changeset
|
568 7+ |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
569 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
570 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
571 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
572 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
573 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
574 Sticky repository, update --clean |
16264
0628290d98df
tests: ignore git's output in test-subrepo-git.t
Javi Merino <cibervicho@gmail.com>
parents:
15531
diff
changeset
|
575 $ hg update --clean tip 2>/dev/null |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
576 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
577 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
578 7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
579 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
580 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
581 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
582 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
583 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
584 Test subrepo already at intended revision: |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
585 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
586 $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
587 HEAD is now at 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
588 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
589 $ hg update 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
590 Previous HEAD position was 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
591 HEAD is now at da5f5b1... g |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
592 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
593 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
594 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
595 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
596 $ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
597 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
598 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
599 |
16527
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16271
diff
changeset
|
600 Test forgetting files, not implemented in git subrepo, used to |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16271
diff
changeset
|
601 traceback |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
602 #if no-windows |
16527
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16271
diff
changeset
|
603 $ hg forget 'notafile*' |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16271
diff
changeset
|
604 notafile*: No such file or directory |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16271
diff
changeset
|
605 [1] |
17022
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
606 #else |
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
607 $ hg forget 'notafile' |
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
608 notafile: * (glob) |
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
609 [1] |
8a38839ae1dc
test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16913
diff
changeset
|
610 #endif |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16527
diff
changeset
|
611 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16527
diff
changeset
|
612 $ cd .. |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
613 |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
614 Test sanitizing ".hg/hgrc" in subrepo |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
615 |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
616 $ cd t |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
617 $ hg tip -q |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
618 7:af6d2edbb0d3 |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
619 $ hg update -q -C af6d2edbb0d3 |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
620 $ cd s |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
621 $ git checkout -q -b sanitize-test |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
622 $ mkdir .hg |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
623 $ echo '.hg/hgrc in git repo' > .hg/hgrc |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
624 $ mkdir -p sub/.hg |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
625 $ echo 'sub/.hg/hgrc in git repo' > sub/.hg/hgrc |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
626 $ git add .hg sub |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
627 $ git commit -qm 'add .hg/hgrc to be sanitized at hg update' |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
628 $ git push -q origin sanitize-test |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
629 $ cd .. |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
630 $ grep ' s$' .hgsubstate |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
631 32a343883b74769118bb1d3b4b1fbf9156f4dddc s |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
632 $ hg commit -qm 'commit with git revision including .hg/hgrc' |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
633 $ hg parents -q |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
634 8:3473d20bddcf |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
635 $ grep ' s$' .hgsubstate |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
636 c4069473b459cf27fd4d7c2f50c4346b4e936599 s |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
637 $ cd .. |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
638 |
21566
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
639 $ hg -R tc pull -q |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
640 $ hg -R tc update -q -C 3473d20bddcf 2>&1 | sort |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
641 warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob) |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
642 warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg' (glob) |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
643 $ cd tc |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
644 $ hg parents -q |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
645 8:3473d20bddcf |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
646 $ grep ' s$' .hgsubstate |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
647 c4069473b459cf27fd4d7c2f50c4346b4e936599 s |
21748
8621125a1718
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21567
diff
changeset
|
648 $ test -f s/.hg/hgrc |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
649 [1] |
21748
8621125a1718
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21567
diff
changeset
|
650 $ test -f s/sub/.hg/hgrc |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
651 [1] |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
652 $ cd .. |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
653 |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
654 additional test for "git merge --ff" route: |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
655 |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
656 $ cd t |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
657 $ hg tip -q |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
658 8:3473d20bddcf |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
659 $ hg update -q -C af6d2edbb0d3 |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
660 $ cd s |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
661 $ git checkout -q testing |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
662 $ mkdir .hg |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
663 $ echo '.hg/hgrc in git repo' > .hg/hgrc |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
664 $ mkdir -p sub/.hg |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
665 $ echo 'sub/.hg/hgrc in git repo' > sub/.hg/hgrc |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
666 $ git add .hg sub |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
667 $ git commit -qm 'add .hg/hgrc to be sanitized at hg update (git merge --ff)' |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
668 $ git push -q origin testing |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
669 $ cd .. |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
670 $ grep ' s$' .hgsubstate |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
671 32a343883b74769118bb1d3b4b1fbf9156f4dddc s |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
672 $ hg commit -qm 'commit with git revision including .hg/hgrc' |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
673 $ hg parents -q |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
674 9:ed23f7fe024e |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
675 $ grep ' s$' .hgsubstate |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
676 f262643c1077219fbd3858d54e78ef050ef84fbf s |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
677 $ cd .. |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
678 |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
679 $ cd tc |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
680 $ hg update -q -C af6d2edbb0d3 |
21748
8621125a1718
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21567
diff
changeset
|
681 $ test -f s/.hg/hgrc |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
682 [1] |
21748
8621125a1718
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21567
diff
changeset
|
683 $ test -f s/sub/.hg/hgrc |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
684 [1] |
21566
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
685 $ cd .. |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
686 $ hg -R tc pull -q |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
687 $ hg -R tc update -q -C ed23f7fe024e 2>&1 | sort |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
688 warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob) |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
689 warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg' (glob) |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21565
diff
changeset
|
690 $ cd tc |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
691 $ hg parents -q |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
692 9:ed23f7fe024e |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
693 $ grep ' s$' .hgsubstate |
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
694 f262643c1077219fbd3858d54e78ef050ef84fbf s |
21748
8621125a1718
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21567
diff
changeset
|
695 $ test -f s/.hg/hgrc |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
696 [1] |
21748
8621125a1718
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21567
diff
changeset
|
697 $ test -f s/sub/.hg/hgrc |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
698 [1] |
21567
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
699 |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
700 Test that sanitizing is omitted in meta data area: |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
701 |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
702 $ mkdir s/.git/.hg |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
703 $ echo '.hg/hgrc in git metadata area' > s/.git/.hg/hgrc |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
704 $ hg update -q -C af6d2edbb0d3 |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
705 checking out detached HEAD in subrepository "s" |
21567
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
706 check out a git branch if you intend to make changes |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
707 |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
708 check differences made by most recent change |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
709 $ cd s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
710 $ cat > foobar << EOF |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
711 > woopwoop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
712 > |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
713 > foo |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
714 > bar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
715 > EOF |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
716 $ git add foobar |
21565
7f7f634d073d
subrepo: invoke "_sanitize()" also after "git merge --ff"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
717 $ cd .. |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
718 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
719 $ hg diff --subrepos |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
720 diff --git a/s/foobar b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
721 new file mode 100644 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
722 index 0000000..8a5a5e2 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
723 --- /dev/null |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
724 +++ b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
725 @@ -0,0 +1,4 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
726 +woopwoop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
727 + |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
728 +foo |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
729 +bar |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
730 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
731 $ hg commit --subrepos -m "Added foobar" |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
732 committing subrepository s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
733 created new head |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
734 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
735 $ hg diff -c . --subrepos --nodates |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
736 diff -r af6d2edbb0d3 -r 255ee8cf690e .hgsubstate |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
737 --- a/.hgsubstate |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
738 +++ b/.hgsubstate |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
739 @@ -1,1 +1,1 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
740 -32a343883b74769118bb1d3b4b1fbf9156f4dddc s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
741 +fd4dbf828a5b2fcd36b2bcf21ea773820970d129 s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
742 diff --git a/s/foobar b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
743 new file mode 100644 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
744 index 0000000..8a5a5e2 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
745 --- /dev/null |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
746 +++ b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
747 @@ -0,0 +1,4 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
748 +woopwoop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
749 + |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
750 +foo |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
751 +bar |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
752 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
753 check output when only diffing the subrepository |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
754 $ hg diff -c . --subrepos s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
755 diff --git a/s/foobar b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
756 new file mode 100644 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
757 index 0000000..8a5a5e2 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
758 --- /dev/null |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
759 +++ b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
760 @@ -0,0 +1,4 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
761 +woopwoop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
762 + |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
763 +foo |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
764 +bar |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
765 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
766 check output when diffing something else |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
767 $ hg diff -c . --subrepos .hgsubstate --nodates |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
768 diff -r af6d2edbb0d3 -r 255ee8cf690e .hgsubstate |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
769 --- a/.hgsubstate |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
770 +++ b/.hgsubstate |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
771 @@ -1,1 +1,1 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
772 -32a343883b74769118bb1d3b4b1fbf9156f4dddc s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
773 +fd4dbf828a5b2fcd36b2bcf21ea773820970d129 s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
774 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
775 add new changes, including whitespace |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
776 $ cd s |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
777 $ cat > foobar << EOF |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
778 > woop woop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
779 > |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
780 > foo |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
781 > bar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
782 > EOF |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
783 $ echo foo > barfoo |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
784 $ git add barfoo |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
785 $ cd .. |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
786 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
787 $ hg diff --subrepos --ignore-all-space |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
788 diff --git a/s/barfoo b/s/barfoo |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
789 new file mode 100644 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
790 index 0000000..257cc56 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
791 --- /dev/null |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
792 +++ b/s/barfoo |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26969
diff
changeset
|
793 @@ -0,0 +1* @@ (glob) |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
794 +foo |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
795 $ hg diff --subrepos s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
796 diff --git a/s/foobar b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
797 index 8a5a5e2..bd5812a 100644 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
798 --- a/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
799 +++ b/s/foobar |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
800 @@ -1,4 +1,4 @@ |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
801 -woopwoop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
802 +woop woop |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
803 |
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
804 foo |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
805 bar |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
806 |
23542
8b5adc6b72ae
tests: allow more flexibility in git diffstat output
Mathias De Maré <mathias.demare@gmail.com>
parents:
23523
diff
changeset
|
807 execute a diffstat |
8b5adc6b72ae
tests: allow more flexibility in git diffstat output
Mathias De Maré <mathias.demare@gmail.com>
parents:
23523
diff
changeset
|
808 the output contains a regex, because git 1.7.10 and 1.7.11 |
8b5adc6b72ae
tests: allow more flexibility in git diffstat output
Mathias De Maré <mathias.demare@gmail.com>
parents:
23523
diff
changeset
|
809 change the amount of whitespace |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
810 $ hg diff --subrepos --stat |
23542
8b5adc6b72ae
tests: allow more flexibility in git diffstat output
Mathias De Maré <mathias.demare@gmail.com>
parents:
23523
diff
changeset
|
811 \s*barfoo |\s*1 + (re) |
8b5adc6b72ae
tests: allow more flexibility in git diffstat output
Mathias De Maré <mathias.demare@gmail.com>
parents:
23523
diff
changeset
|
812 \s*foobar |\s*2 +- (re) |
23938
de519517f597
subrepo: correctly add newline for git subrepo diffs
Mathias De Maré <mathias.demare@gmail.com>
parents:
23937
diff
changeset
|
813 2 files changed, 2 insertions\(\+\), 1 deletions?\(-\) (re) |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
814 |
24778
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
815 adding an include should ignore the other elements |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
816 $ hg diff --subrepos -I s/foobar |
24778
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
817 diff --git a/s/foobar b/s/foobar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
818 index 8a5a5e2..bd5812a 100644 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
819 --- a/s/foobar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
820 +++ b/s/foobar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
821 @@ -1,4 +1,4 @@ |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
822 -woopwoop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
823 +woop woop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
824 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
825 foo |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
826 bar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
827 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
828 adding an exclude should ignore this element |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
829 $ hg diff --subrepos -X s/foobar |
24778
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
830 diff --git a/s/barfoo b/s/barfoo |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
831 new file mode 100644 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
832 index 0000000..257cc56 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
833 --- /dev/null |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
834 +++ b/s/barfoo |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26969
diff
changeset
|
835 @@ -0,0 +1* @@ (glob) |
24778
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
836 +foo |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
837 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
838 moving a file should show a removal and an add |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
839 $ hg revert --all |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
840 reverting subrepo ../gitroot |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
841 $ cd s |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
842 $ git mv foobar woop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
843 $ cd .. |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
844 $ hg diff --subrepos |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
845 diff --git a/s/foobar b/s/foobar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
846 deleted file mode 100644 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
847 index 8a5a5e2..0000000 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
848 --- a/s/foobar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
849 +++ /dev/null |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
850 @@ -1,4 +0,0 @@ |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
851 -woopwoop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
852 - |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
853 -foo |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
854 -bar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
855 diff --git a/s/woop b/s/woop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
856 new file mode 100644 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
857 index 0000000..8a5a5e2 |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
858 --- /dev/null |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
859 +++ b/s/woop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
860 @@ -0,0 +1,4 @@ |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
861 +woopwoop |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
862 + |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
863 +foo |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
864 +bar |
a48b65ab428d
subrepo: add include/exclude support for diffing git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24581
diff
changeset
|
865 $ rm s/woop |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
866 |
23550
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
867 revert the subrepository |
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
868 $ hg revert --all |
23937
fd5b9417d315
tests: discard useless "(glob)" in "reverting subrepo" lines
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23693
diff
changeset
|
869 reverting subrepo ../gitroot |
23550
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
870 |
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
871 $ hg status --subrepos |
23678
194d2f185008
subrepo: add full revert support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23551
diff
changeset
|
872 ? s/barfoo |
194d2f185008
subrepo: add full revert support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23551
diff
changeset
|
873 ? s/foobar.orig |
23550
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
874 |
23678
194d2f185008
subrepo: add full revert support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23551
diff
changeset
|
875 $ mv s/foobar.orig s/foobar |
194d2f185008
subrepo: add full revert support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23551
diff
changeset
|
876 |
23550
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
877 $ hg revert --no-backup s |
23937
fd5b9417d315
tests: discard useless "(glob)" in "reverting subrepo" lines
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23693
diff
changeset
|
878 reverting subrepo ../gitroot |
23550
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
879 |
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
880 $ hg status --subrepos |
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
881 ? s/barfoo |
7fa2189c1e87
subrepo: add revert support without backup for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23542
diff
changeset
|
882 |
26940
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
883 revert moves orig files to the right place |
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
884 $ echo 'bloop' > s/foobar |
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
885 $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
886 reverting subrepo ../gitroot |
26969
b54b520a24c2
tests: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
26940
diff
changeset
|
887 creating directory: $TESTTMP/tc/.hg/origbackups (glob) |
34146
9e4f82bc2b0b
scmutil: don't append .orig to backups in origbackuppath (BC)
Mark Thomas <mbthomas@fb.com>
parents:
33660
diff
changeset
|
888 saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar (glob) |
26940
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
889 $ ls .hg/origbackups |
34146
9e4f82bc2b0b
scmutil: don't append .orig to backups in origbackuppath (BC)
Mark Thomas <mbthomas@fb.com>
parents:
33660
diff
changeset
|
890 foobar |
26940
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
891 $ rm -rf .hg/origbackups |
91786f20db83
git-subrepos: revert respects specified location to save .orig files
Christian Delahousse <cdelahousse@fb.com>
parents:
24964
diff
changeset
|
892 |
23991
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
893 show file at specific revision |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
894 $ cat > s/foobar << EOF |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
895 > woop woop |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
896 > fooo bar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
897 > EOF |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
898 $ hg commit --subrepos -m "updated foobar" |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
899 committing subrepository s |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
900 $ cat > s/foobar << EOF |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
901 > current foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
902 > (should not be visible using hg cat) |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
903 > EOF |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
904 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
905 $ hg cat -r . s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
906 woop woop |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
907 fooo bar (no-eol) |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
908 $ hg cat -r "parents(.)" s/foobar > catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
909 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
910 $ mkdir -p tmp/s |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
911 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
912 $ hg cat -r "parents(.)" --output tmp/%% s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
913 $ diff tmp/% catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
914 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
915 $ hg cat -r "parents(.)" --output tmp/%s s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
916 $ diff tmp/foobar catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
917 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
918 $ hg cat -r "parents(.)" --output tmp/%d/otherfoobar s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
919 $ diff tmp/s/otherfoobar catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
920 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
921 $ hg cat -r "parents(.)" --output tmp/%p s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
922 $ diff tmp/s/foobar catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
923 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
924 $ hg cat -r "parents(.)" --output tmp/%H s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
925 $ diff tmp/255ee8cf690ec86e99b1e80147ea93ece117cd9d catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
926 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
927 $ hg cat -r "parents(.)" --output tmp/%R s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
928 $ diff tmp/10 catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
929 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
930 $ hg cat -r "parents(.)" --output tmp/%h s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
931 $ diff tmp/255ee8cf690e catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
932 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
933 $ rm tmp/10 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
934 $ hg cat -r "parents(.)" --output tmp/%r s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
935 $ diff tmp/10 catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
936 |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
937 $ mkdir tmp/tc |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
938 $ hg cat -r "parents(.)" --output tmp/%b/foobar s/foobar |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
939 $ diff tmp/tc/foobar catparents |
07c1a7d1ef69
subrepo: add 'cat' support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23963
diff
changeset
|
940 |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
941 cleanup |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
942 $ rm -r tmp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
943 $ rm catparents |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
944 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
945 add git files, using either files or patterns |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
946 $ echo "hsss! hsssssssh!" > s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
947 $ echo "ccc" > s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
948 $ echo "cpp" > s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
949 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
950 $ hg add s/snake.python s/c.c s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
951 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
952 M s/foobar |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
953 A s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
954 A s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
955 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
956 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
957 $ hg revert s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
958 reverting subrepo ../gitroot |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
959 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
960 $ hg add --subrepos "glob:**.python" |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
961 adding s/snake.python (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
962 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
963 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
964 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
965 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
966 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
967 ? s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
968 $ hg revert s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
969 reverting subrepo ../gitroot |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
970 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
971 $ hg add --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
972 adding s/barfoo (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
973 adding s/c.c (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
974 adding s/cpp.cpp (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
975 adding s/foobar.orig (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
976 adding s/snake.python (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
977 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
978 A s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
979 A s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
980 A s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
981 A s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
982 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
983 $ hg revert s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
984 reverting subrepo ../gitroot |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
985 make sure everything is reverted correctly |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
986 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
987 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
988 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
989 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
990 ? s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
991 ? s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
992 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
993 $ hg add --subrepos --exclude "path:s/c.c" |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
994 adding s/barfoo (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
995 adding s/cpp.cpp (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
996 adding s/foobar.orig (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
997 adding s/snake.python (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
998 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
999 A s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1000 A s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1001 A s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1002 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1003 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1004 $ hg revert --all -q |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1005 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1006 .hgignore should not have influence in subrepos |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1007 $ cat > .hgignore << EOF |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1008 > syntax: glob |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1009 > *.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1010 > EOF |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1011 $ hg add .hgignore |
24182
00ef3edcf1d5
subrepo: don't exclude files in .hgignore when adding to git
Matt Harbison <matt_harbison@yahoo.com>
parents:
24174
diff
changeset
|
1012 $ hg add --subrepos "glob:**.python" s/barfoo |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1013 adding s/snake.python (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1014 $ hg st --subrepos s |
24182
00ef3edcf1d5
subrepo: don't exclude files in .hgignore when adding to git
Matt Harbison <matt_harbison@yahoo.com>
parents:
24174
diff
changeset
|
1015 A s/barfoo |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1016 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1017 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1018 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1019 ? s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1020 $ hg revert --all -q |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1021 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1022 .gitignore should have influence, |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1023 except for explicitly added files (no patterns) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1024 $ cat > s/.gitignore << EOF |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1025 > *.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1026 > EOF |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1027 $ hg add s/.gitignore |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1028 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1029 A s/.gitignore |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1030 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1031 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1032 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1033 ? s/foobar.orig |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1034 $ hg st --subrepos s --all |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1035 A s/.gitignore |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1036 ? s/barfoo |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1037 ? s/c.c |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1038 ? s/cpp.cpp |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1039 ? s/foobar.orig |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1040 I s/snake.python |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1041 C s/f |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1042 C s/foobar |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1043 C s/g |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1044 $ hg add --subrepos "glob:**.python" |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1045 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1046 A s/.gitignore |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1047 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1048 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1049 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1050 ? s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1051 $ hg add --subrepos s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1052 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1053 A s/.gitignore |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1054 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1055 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1056 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1057 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1058 ? s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1059 |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1060 correctly do a dry run |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1061 $ hg add --subrepos s --dry-run |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1062 adding s/barfoo (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1063 adding s/c.c (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1064 adding s/cpp.cpp (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1065 adding s/foobar.orig (glob) |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1066 $ hg st --subrepos s |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1067 A s/.gitignore |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1068 A s/snake.python |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1069 ? s/barfoo |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1070 ? s/c.c |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1071 ? s/cpp.cpp |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1072 ? s/foobar.orig |
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1073 |
24183
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1074 error given when adding an already tracked file |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1075 $ hg add s/.gitignore |
24183
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1076 s/.gitignore already tracked! |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1077 [1] |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1078 $ hg add s/g |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1079 s/g already tracked! |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1080 [1] |
24183
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1081 |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1082 removed files can be re-added |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1083 removing files using 'rm' or 'git rm' has the same effect, |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1084 since we ignore the staging area |
24183
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1085 $ hg ci --subrepos -m 'snake' |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1086 committing subrepository s |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1087 $ cd s |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1088 $ rm snake.python |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1089 (remove leftover .hg so Mercurial doesn't look for a root here) |
24581
85219d6ece67
tests: handle deleted .hg directory (git 2.2.0 and higher) (issue4585)
Mathias De Maré <mathias.demare@gmail.com>
parents:
24256
diff
changeset
|
1090 $ rm -rf .hg |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1091 $ hg status --subrepos --all . |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1092 R snake.python |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1093 ? barfoo |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1094 ? c.c |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1095 ? cpp.cpp |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1096 ? foobar.orig |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1097 C .gitignore |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1098 C f |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1099 C foobar |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1100 C g |
24183
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1101 $ git rm snake.python |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1102 rm 'snake.python' |
24256
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1103 $ hg status --subrepos --all . |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1104 R snake.python |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1105 ? barfoo |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1106 ? c.c |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1107 ? cpp.cpp |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1108 ? foobar.orig |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1109 C .gitignore |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1110 C f |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1111 C foobar |
e964edc3274e
subrepo: add status support for ignored and clean files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
24183
diff
changeset
|
1112 C g |
24183
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1113 $ touch snake.python |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1114 $ cd .. |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1115 $ hg add s/snake.python |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1116 $ hg status -S |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1117 M s/snake.python |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1118 ? .hgignore |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1119 ? s/barfoo |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1120 ? s/c.c |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1121 ? s/cpp.cpp |
932de135041f
subrepo: warn when adding already tracked files in gitsubrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
24182
diff
changeset
|
1122 ? s/foobar.orig |
24943
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1123 $ hg revert --all -q |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1124 |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1125 make sure we show changed files, rather than changed subtrees |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1126 $ mkdir s/foo |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1127 $ touch s/foo/bwuh |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1128 $ hg add s/foo/bwuh |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1129 $ hg commit -S -m "add bwuh" |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1130 committing subrepository s |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1131 $ hg status -S --change . |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1132 M .hgsubstate |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1133 A s/foo/bwuh |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1134 ? s/barfoo |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1135 ? s/c.c |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1136 ? s/cpp.cpp |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1137 ? s/foobar.orig |
3e39f67ef663
subrepo: correctly handle git subdirectory status change
Mathias De Maré <mathias.demare@gmail.com>
parents:
24924
diff
changeset
|
1138 ? s/snake.python.orig |
24174
bd9f64ec891d
subrepos: support adding files in git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23991
diff
changeset
|
1139 |
32902
642feee29d70
tests: protect tests involving git ext::sh with git-ext-sh
Sean Farley <sean@farley.io>
parents:
32413
diff
changeset
|
1140 #if git19 |
642feee29d70
tests: protect tests involving git ext::sh with git-ext-sh
Sean Farley <sean@farley.io>
parents:
32413
diff
changeset
|
1141 |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1142 test for Git CVE-2016-3068 |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1143 $ hg init malicious-subrepository |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1144 $ cd malicious-subrepository |
29295
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1145 $ echo "s = [git]ext::sh -c echo% pwned:% \$PWNED_MSG% >pwned.txt" > .hgsub |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1146 $ git init s |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1147 Initialized empty Git repository in $TESTTMP/tc/malicious-subrepository/s/.git/ |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1148 $ cd s |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1149 $ git commit --allow-empty -m 'empty' |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1150 [master (root-commit) 153f934] empty |
23523
01a8dfc79cdc
subrepo: add partial diff support for git subrepos
Mathias De Maré <mathias.demare@gmail.com>
parents:
23411
diff
changeset
|
1151 $ cd .. |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1152 $ hg add .hgsub |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1153 $ hg commit -m "add subrepo" |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1154 $ cd .. |
29256
1f8b861ba15c
tests-subrepo-git: make the "pwned" message output in a stable order
Danek Duvall <danek.duvall@oracle.com>
parents:
28939
diff
changeset
|
1155 $ rm -f pwned.txt |
29135
3879d02cd1cc
subrepo: use unset instead of env -u to fix test on BSDs (issue5229)
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
28939
diff
changeset
|
1156 $ unset GIT_ALLOW_PROTOCOL |
29328 | 1157 $ PWNED_MSG="your git is too old or mercurial has regressed" hg clone \ |
29257
a9764ab80e11
tests-subrepo-git: emit a different "pwned" message based on the test
Danek Duvall <danek.duvall@oracle.com>
parents:
29256
diff
changeset
|
1158 > malicious-subrepository malicious-subrepository-protected |
28939
ce01b4810aef
test-subrepo-git: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
28670
diff
changeset
|
1159 Cloning into '$TESTTMP/tc/malicious-subrepository-protected/s'... (glob) |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1160 fatal: transport 'ext' not allowed |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1161 updating to branch default |
29295
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1162 cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
1163 abort: git clone error 128 in s (in subrepository "s") |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1164 [255] |
29295
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1165 $ f -Dq pwned.txt |
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1166 pwned.txt: file not found |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1167 |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1168 whitelisting of ext should be respected (that's the git submodule behaviour) |
29256
1f8b861ba15c
tests-subrepo-git: make the "pwned" message output in a stable order
Danek Duvall <danek.duvall@oracle.com>
parents:
28939
diff
changeset
|
1169 $ rm -f pwned.txt |
29257
a9764ab80e11
tests-subrepo-git: emit a different "pwned" message based on the test
Danek Duvall <danek.duvall@oracle.com>
parents:
29256
diff
changeset
|
1170 $ env GIT_ALLOW_PROTOCOL=ext PWNED_MSG="you asked for it" hg clone \ |
a9764ab80e11
tests-subrepo-git: emit a different "pwned" message based on the test
Danek Duvall <danek.duvall@oracle.com>
parents:
29256
diff
changeset
|
1171 > malicious-subrepository malicious-subrepository-clone-allowed |
28939
ce01b4810aef
test-subrepo-git: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
28670
diff
changeset
|
1172 Cloning into '$TESTTMP/tc/malicious-subrepository-clone-allowed/s'... (glob) |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1173 fatal: Could not read from remote repository. |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1174 |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1175 Please make sure you have the correct access rights |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1176 and the repository exists. |
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1177 updating to branch default |
29295
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1178 cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32902
diff
changeset
|
1179 abort: git clone error 128 in s (in subrepository "s") |
28658
34d43cb85de8
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
Mateusz Kwapich <mitrandir@fb.com>
parents:
26969
diff
changeset
|
1180 [255] |
29295
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1181 $ f -Dq pwned.txt |
9b4f0ad02f51
tests-subrepo-git: use "f" to dump pwned.txt, for portability
Danek Duvall <danek.duvall@oracle.com>
parents:
29257
diff
changeset
|
1182 pwned: you asked for it |
32902
642feee29d70
tests: protect tests involving git ext::sh with git-ext-sh
Sean Farley <sean@farley.io>
parents:
32413
diff
changeset
|
1183 |
642feee29d70
tests: protect tests involving git ext::sh with git-ext-sh
Sean Farley <sean@farley.io>
parents:
32413
diff
changeset
|
1184 #endif |
33658
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1185 |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1186 test for ssh exploit with git subrepos 2017-07-25 |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1187 |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1188 $ hg init malicious-proxycommand |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1189 $ cd malicious-proxycommand |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1190 $ echo 's = [git]ssh://-oProxyCommand=rm${IFS}non-existent/path' > .hgsub |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1191 $ git init s |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1192 Initialized empty Git repository in $TESTTMP/tc/malicious-proxycommand/s/.git/ |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1193 $ cd s |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1194 $ git commit --allow-empty -m 'empty' |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1195 [master (root-commit) 153f934] empty |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1196 $ cd .. |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1197 $ hg add .hgsub |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1198 $ hg ci -m 'add subrepo' |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1199 $ cd .. |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1200 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1201 updating to branch default |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1202 abort: potentially unsafe url: 'ssh://-oProxyCommand=rm${IFS}non-existent/path' (in subrepository "s") |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1203 [255] |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1204 |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1205 also check that a percent encoded '-' (%2D) doesn't work |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1206 |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1207 $ cd malicious-proxycommand |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1208 $ echo 's = [git]ssh://%2DoProxyCommand=rm${IFS}non-existent/path' > .hgsub |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1209 $ hg ci -m 'change url to percent encoded' |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1210 $ cd .. |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1211 $ rm -r malicious-proxycommand-clone |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1212 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1213 updating to branch default |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1214 abort: potentially unsafe url: 'ssh://-oProxyCommand=rm${IFS}non-existent/path' (in subrepository "s") |
db83a1df03fe
subrepo: add tests for git rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1215 [255] |