Mercurial > hg
annotate tests/test-journal-share.t @ 30435:b86a448a2965
zstd: vendor python-zstandard 0.5.0
As the commit message for the previous changeset says, we wish
for zstd to be a 1st class citizen in Mercurial. To make that
happen, we need to enable Python to talk to the zstd C API. And
that requires bindings.
This commit vendors a copy of existing Python bindings. Why do we
need to vendor? As the commit message of the previous commit says,
relying on systems in the wild to have the bindings or zstd present
is a losing proposition. By distributing the zstd and bindings with
Mercurial, we significantly increase our chances that zstd will
work. Since zstd will deliver a better end-user experience by
achieving better performance, this benefits our users. Another
reason is that the Python bindings still aren't stable and the
API is somewhat fluid. While Mercurial could be coded to target
multiple versions of the Python bindings, it is safer to bundle
an explicit, known working version.
The added Python bindings are mostly a fully-featured interface
to the zstd C API. They allow one-shot operations, streaming,
reading and writing from objects implements the file object
protocol, dictionary compression, control over low-level compression
parameters, and more. The Python bindings work on Python 2.6,
2.7, and 3.3+ and have been tested on Linux and Windows. There are
CFFI bindings, but they are lacking compared to the C extension.
Upstream work will be needed before we can support zstd with PyPy.
But it will be possible.
The files added in this commit come from Git commit
e637c1b214d5f869cf8116c550dcae23ec13b677 from
https://github.com/indygreg/python-zstandard and are added without
modifications. Some files from the upstream repository have been
omitted, namely files related to continuous integration.
In the spirit of full disclosure, I'm the maintainer of the
"python-zstandard" project and have authored 100% of the code
added in this commit. Unfortunately, the Python bindings have
not been formally code reviewed by anyone. While I've tested
much of the code thoroughly (I even have tests that fuzz APIs),
there's a good chance there are bugs, memory leaks, not well
thought out APIs, etc. If someone wants to review the code and
send feedback to the GitHub project, it would be greatly
appreciated.
Despite my involvement with both projects, my opinions of code
style differ from Mercurial's. The code in this commit introduces
numerous code style violations in Mercurial's linters. So, the code
is excluded from most lints. However, some violations I agree with.
These have been added to the known violations ignore list for now.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 10 Nov 2016 22:15:58 -0800 |
parents | 9843e3d9f4b6 |
children | a8a902d7176e |
rev | line source |
---|---|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
1 Journal extension test: tests the share extension support |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
3 $ cat >> testmocks.py << EOF |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
4 > # mock out util.getuser() and util.makedate() to supply testable values |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
5 > import os |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
6 > from mercurial import util |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
7 > def mockgetuser(): |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
8 > return 'foobar' |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
9 > |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
10 > def mockmakedate(): |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
11 > filename = os.path.join(os.environ['TESTTMP'], 'testtime') |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
12 > try: |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
13 > with open(filename, 'rb') as timef: |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
14 > time = float(timef.read()) + 1 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
15 > except IOError: |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
16 > time = 0.0 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
17 > with open(filename, 'wb') as timef: |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
18 > timef.write(str(time)) |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
19 > return (time, 0) |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
20 > |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
21 > util.getuser = mockgetuser |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
22 > util.makedate = mockmakedate |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
23 > EOF |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
24 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
25 $ cat >> $HGRCPATH << EOF |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
26 > [extensions] |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
27 > journal= |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
28 > share= |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
29 > testmocks=`pwd`/testmocks.py |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
30 > [remotenames] |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
31 > rename.default=remote |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
32 > EOF |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
33 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
34 $ hg init repo |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
35 $ cd repo |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
36 $ hg bookmark bm |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
37 $ touch file0 |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
38 $ hg commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
39 adding file0 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
40 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
41 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
42 0fd3805711f9 . commit -Am file0-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
43 0fd3805711f9 bm commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
44 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
45 A shared working copy initially receives the same bookmarks and working copy |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
46 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
47 $ cd .. |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
48 $ hg share repo shared1 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
49 updating working directory |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
51 $ cd shared1 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
52 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
53 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
54 0fd3805711f9 . share repo shared1 |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
55 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
56 unless you explicitly share bookmarks |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
57 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
58 $ cd .. |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
59 $ hg share --bookmarks repo shared2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
60 updating working directory |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
62 $ cd shared2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
63 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
64 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
65 0fd3805711f9 . share --bookmarks repo shared2 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
66 0fd3805711f9 bm commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
67 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
68 Moving the bookmark in the original repository is only shown in the repository |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
69 that shares bookmarks |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
70 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
71 $ cd ../repo |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
72 $ touch file1 |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
73 $ hg commit -Am file1-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
74 adding file1 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
75 $ cd ../shared1 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
76 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
77 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
78 0fd3805711f9 . share repo shared1 |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
79 $ cd ../shared2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
80 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
81 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
82 4f354088b094 bm commit -Am file1-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
83 0fd3805711f9 . share --bookmarks repo shared2 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
84 0fd3805711f9 bm commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
85 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
86 But working copy changes are always 'local' |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
87 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
88 $ cd ../repo |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
89 $ hg up 0 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
91 (leaving bookmark bm) |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
92 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
93 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
94 0fd3805711f9 . up 0 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
95 4f354088b094 . commit -Am file1-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
96 4f354088b094 bm commit -Am file1-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
97 0fd3805711f9 . commit -Am file0-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
98 0fd3805711f9 bm commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
99 $ cd ../shared2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
100 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
101 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
102 4f354088b094 bm commit -Am file1-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
103 0fd3805711f9 . share --bookmarks repo shared2 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
104 0fd3805711f9 bm commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
105 $ hg up tip |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
106 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
107 $ hg up 0 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
108 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
109 $ hg journal |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
110 previous locations of '.': |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
111 0fd3805711f9 up 0 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
112 4f354088b094 up tip |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
113 0fd3805711f9 share --bookmarks repo shared2 |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
114 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
115 Unsharing works as expected; the journal remains consistent |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
116 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
117 $ cd ../shared1 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
118 $ hg unshare |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
119 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
120 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
121 0fd3805711f9 . share repo shared1 |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
122 $ cd ../shared2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
123 $ hg unshare |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
124 $ hg journal --all |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
125 previous locations of the working copy and bookmarks: |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
126 0fd3805711f9 . up 0 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
127 4f354088b094 . up tip |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
128 4f354088b094 bm commit -Am file1-added |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
129 0fd3805711f9 . share --bookmarks repo shared2 |
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
130 0fd3805711f9 bm commit -Am file0-added |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
131 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
132 New journal entries in the source repo no longer show up in the other working copies |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
133 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
134 $ cd ../repo |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
135 $ hg bookmark newbm -r tip |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
136 $ hg journal newbm |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
137 previous locations of 'newbm': |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
138 4f354088b094 bookmark newbm -r tip |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
139 $ cd ../shared2 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
140 $ hg journal newbm |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
141 previous locations of 'newbm': |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
142 no recorded locations |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
143 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
144 This applies for both directions |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
145 |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
146 $ hg bookmark shared2bm -r tip |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
147 $ hg journal shared2bm |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
148 previous locations of 'shared2bm': |
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
149 4f354088b094 bookmark shared2bm -r tip |
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
150 $ cd ../repo |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
151 $ hg journal shared2bm |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
152 previous locations of 'shared2bm': |
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
153 no recorded locations |