Show More
@@ -100,6 +100,7 b' Note: old client behave as a publishing ' | |||||
100 |
|
100 | |||
101 | """ |
|
101 | """ | |
102 |
|
102 | |||
|
103 | import os | |||
103 | import errno |
|
104 | import errno | |
104 | from node import nullid, nullrev, bin, hex, short |
|
105 | from node import nullid, nullrev, bin, hex, short | |
105 | from i18n import _ |
|
106 | from i18n import _ | |
@@ -124,7 +125,15 b' def _readroots(repo, phasedefaults=None)' | |||||
124 | dirty = False |
|
125 | dirty = False | |
125 | roots = [set() for i in allphases] |
|
126 | roots = [set() for i in allphases] | |
126 | try: |
|
127 | try: | |
127 | f = repo.sopener('phaseroots') |
|
128 | f = None | |
|
129 | if 'HG_PENDING' in os.environ: | |||
|
130 | try: | |||
|
131 | f = repo.svfs('phaseroots.pending') | |||
|
132 | except IOError, inst: | |||
|
133 | if inst.errno != errno.ENOENT: | |||
|
134 | raise | |||
|
135 | if f is None: | |||
|
136 | f = repo.sopener('phaseroots') | |||
128 | try: |
|
137 | try: | |
129 | for line in f: |
|
138 | for line in f: | |
130 | phase, nh = line.split() |
|
139 | phase, nh = line.split() |
@@ -61,7 +61,7 b' clone --pull' | |||||
61 | adding file changes |
|
61 | adding file changes | |
62 | added 2 changesets with 2 changes to 2 files |
|
62 | added 2 changesets with 2 changes to 2 files | |
63 | 1 new obsolescence markers |
|
63 | 1 new obsolescence markers | |
64 |
pre-close-tip:9520eea781bc |
|
64 | pre-close-tip:9520eea781bc draft | |
65 | postclose-tip:9520eea781bc draft |
|
65 | postclose-tip:9520eea781bc draft | |
66 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
66 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
67 | changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
67 | changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
@@ -86,7 +86,7 b' pull' | |||||
86 | adding file changes |
|
86 | adding file changes | |
87 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
87 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
88 | 1 new obsolescence markers |
|
88 | 1 new obsolescence markers | |
89 |
pre-close-tip:24b6387c8c8c |
|
89 | pre-close-tip:24b6387c8c8c draft | |
90 | postclose-tip:24b6387c8c8c draft |
|
90 | postclose-tip:24b6387c8c8c draft | |
91 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
91 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
92 | changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
92 | changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
@@ -166,7 +166,7 b' push' | |||||
166 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
|
166 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 | |
167 | pushing to other |
|
167 | pushing to other | |
168 | searching for changes |
|
168 | searching for changes | |
169 |
pre-close-tip:eea13746799a |
|
169 | pre-close-tip:eea13746799a public book_eea1 | |
170 | postclose-tip:eea13746799a public book_eea1 |
|
170 | postclose-tip:eea13746799a public book_eea1 | |
171 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
|
171 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push | |
172 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_SOURCE=push HG_URL=push |
|
172 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_SOURCE=push HG_URL=push | |
@@ -201,7 +201,7 b' pull over ssh' | |||||
201 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
201 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
202 | 1 new obsolescence markers |
|
202 | 1 new obsolescence markers | |
203 | updating bookmark book_02de |
|
203 | updating bookmark book_02de | |
204 |
pre-close-tip:02de42196ebe |
|
204 | pre-close-tip:02de42196ebe draft book_02de | |
205 | postclose-tip:02de42196ebe draft book_02de |
|
205 | postclose-tip:02de42196ebe draft book_02de | |
206 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
|
206 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=ssh://user@dummy/main | |
207 | changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
|
207 | changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main | |
@@ -226,7 +226,7 b' pull over http' | |||||
226 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
226 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
227 | 1 new obsolescence markers |
|
227 | 1 new obsolescence markers | |
228 | updating bookmark book_42cc |
|
228 | updating bookmark book_42cc | |
229 |
pre-close-tip:42ccdea3bb16 |
|
229 | pre-close-tip:42ccdea3bb16 draft book_42cc | |
230 | postclose-tip:42ccdea3bb16 draft book_42cc |
|
230 | postclose-tip:42ccdea3bb16 draft book_42cc | |
231 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
|
231 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ | |
232 | changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
|
232 | changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
General Comments 0
You need to be logged in to leave comments.
Login now