Mercurial > hg
annotate tests/test-diff-hashes.t @ 33113:fc290a39590d
setup: replace runhg() with an hgcommand helper class
Replace the runhg() function with an hgcommand helper class. hgcommand has as
run() function similar to runhg(), but no longer requires the caller to pass in
the exact path to python and the hg script, and the environment settings for
invoking hg.
For now this diff contains no behavior changes, but in the future this will
make it easier for the hgcommand helper class to more intelligently figure out
the proper way to invoke hg.
author | Adam Simpkins <simpkins@fb.com> |
---|---|
date | Tue, 27 Jun 2017 16:15:32 -0700 |
parents | f2719b387380 |
children | 251332dbf33d |
rev | line source |
---|---|
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
1 $ hg init a |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
2 $ cd a |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
3 |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
4 $ hg diff inexistent1 inexistent2 |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
12156
diff
changeset
|
5 inexistent1: * (glob) |
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
12156
diff
changeset
|
6 inexistent2: * (glob) |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
8 $ echo bar > foo |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
9 $ hg add foo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
10 $ hg ci -m 'add foo' |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
11 |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
12 $ echo foobar > foo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
13 $ hg ci -m 'change foo' |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
15 $ hg --quiet diff -r 0 -r 1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
16 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
17 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
18 @@ -1,1 +1,1 @@ |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
19 -bar |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
20 +foobar |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
22 $ hg diff -r 0 -r 1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
23 diff -r a99fb63adac3 -r 9b8568d3af2f foo |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
24 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
25 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
26 @@ -1,1 +1,1 @@ |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
27 -bar |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
28 +foobar |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
29 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
30 $ hg --verbose diff -r 0 -r 1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
31 diff -r a99fb63adac3 -r 9b8568d3af2f foo |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
32 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
33 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
34 @@ -1,1 +1,1 @@ |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
35 -bar |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
36 +foobar |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
37 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
38 $ hg --debug diff -r 0 -r 1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
39 diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
40 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12137
diff
changeset
|
41 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
12137
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
42 @@ -1,1 +1,1 @@ |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
43 -bar |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
44 +foobar |
e1814ff260c2
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents:
5689
diff
changeset
|
45 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15521
diff
changeset
|
46 $ cd .. |