What's cooking (2012/11 #10)
Junio C Hamano committed
Nov 29, 2012 at 14:52 UTC
f55f34796292a623711988619e6ceab4eeca6059
1 file changed
+228
-219
whats-cooking.txt
+228
-219
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #09; Wed, 28)
4
-X-master-at: b7973fbbc3f8f72df352f4ef1a2ff325db92c36f
5
-X-next-at: 0e4115f14e74f5bdd623ce876941a254499f6c9d
3
+Subject: What's cooking in git.git (Nov 2012, #10; Thu, 29)
4
+X-master-at: f94c3251e1400c3cf349f7f84fea4db66b540113
5
+X-next-at: 19e1b0a2032ea70977d8d774ed994913f067038b
6
7
-What's cooking in git.git (Nov 2012, #09; Wed, 28)
7
+What's cooking in git.git (Nov 2012, #10; Thu, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,135 +23,181 @@ repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
-* bc/append-signed-off-by (2012-11-26) 11 commits
27
- - Unify appending signoff in format-patch, commit and sequencer
28
- - format-patch: update append_signoff prototype
29
- - format-patch: stricter S-o-b detection
30
- - t4014: more tests about appending s-o-b lines
31
- - sequencer.c: teach append_signoff to avoid adding a duplicate newline
32
- - sequencer.c: teach append_signoff how to detect duplicate s-o-b
33
- - sequencer.c: always separate "(cherry picked from" from commit body
34
- - sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
35
- - t/t3511: add some tests of 'cherry-pick -s' functionality
36
- - t/test-lib-functions.sh: allow to specify the tag name to test_commit
37
- - sequencer.c: remove broken support for rfc2822 continuation in footer
26
+* wk/submodule-update-remote (2012-11-28) 2 commits
27
+ - submodule add: If --branch is given, record it in .gitmodules
28
+ - submodule update: add --remote for submodule's upstream changes
29
39
- Will merge to 'next'.
30
+ Still under active discussion.
31
32
+--------------------------------------------------
33
+[Graduated to "master"]
34
35
* er/doc-add-new-commands (2012-11-26) 1 commit
43
- - Documentation: how to add a new command
36
+ (merged to 'next' on 2012-11-28 at 2daf755)
37
+ + Documentation: how to add a new command
38
45
- Will merge to 'next'.
39
40
+* fc/completion-test-simplification (2012-11-16) 6 commits
41
+ (merged to 'next' on 2012-11-28 at b7b2f67)
42
+ + completion: simplify __gitcomp() test helper
43
+ + completion: refactor __gitcomp related tests
44
+ + completion: consolidate test_completion*() tests
45
+ + completion: simplify tests using test_completion_long()
46
+ + completion: standardize final space marker in tests
47
+ + completion: add comment for test_completion()
48
48
-* fc/send-email-no-sender-prompt (2012-11-26) 1 commit
49
- - send-email: avoid questions when user has an ident
50
- (this branch is used by jk/send-email-sender-prompt.)
49
+ Clean up completion tests. Use of conslidated helper may make
50
+ instrumenting one particular test during debugging of the test
51
+ itself, but I think that issue should be addressed in some other
52
+ way (e.g. making sure individual tests in 9902 can be skipped).
53
52
- Will merge to 'next'.
54
55
+* fc/remote-hg (2012-11-27) 22 commits
56
+ (merged to 'next' on 2012-11-28 at f805784)
57
+ + remote-hg: fix for older versions of python
58
+ + remote-hg: fix for files with spaces
59
+ (merged to 'next' on 2012-11-18 at 4a4f2e4)
60
+ + remote-hg: avoid bad refs
61
+ + remote-hg: try the 'tip' if no checkout present
62
+ + remote-hg: fix compatibility with older versions of hg
63
+ + remote-hg: add missing config for basic tests
64
+ + remote-hg: the author email can be null
65
+ + remote-hg: add option to not track branches
66
+ + remote-hg: add extra author test
67
+ + remote-hg: add tests to compare with hg-git
68
+ + remote-hg: add bidirectional tests
69
+ + test-lib: avoid full path to store test results
70
+ + remote-hg: add basic tests
71
+ + remote-hg: fake bookmark when there's none
72
+ + remote-hg: add compat for hg-git author fixes
73
+ + remote-hg: add support for hg-git compat mode
74
+ + remote-hg: match hg merge behavior
75
+ + remote-hg: make sure the encoding is correct
76
+ + remote-hg: add support to push URLs
77
+ + remote-hg: add support for remote pushing
78
+ + remote-hg: add support for pushing
79
+ + Add new remote-hg transport helper
80
55
-* jl/submodule-rm (2012-11-23) 1 commit
56
- (merged to 'next' on 2012-11-28 at 0e4115f)
57
- + Teach rm to remove submodules when given with a trailing '/'
81
+ New remote helper for hg.
82
59
- Finishing touches to the topic already in 'master'.
60
- Will merge to 'master'.
83
84
+* fc/send-email-no-sender-prompt (2012-11-26) 1 commit
85
+ (merged to 'next' on 2012-11-28 at 690d525)
86
+ + send-email: avoid questions when user has an ident
87
+ (this branch is used by jk/send-email-sender-prompt.)
88
63
-* km/send-email-remove-cruft-in-address (2012-11-26) 5 commits
64
- - git-send-email: allow edit invalid email address
65
- - git-send-email: ask what to do with an invalid email address
66
- - git-send-email: remove invalid addresses earlier
67
- - git-send-email: fix fallback code in extract_valid_address()
68
- - git-send-email: remove garbage after email address
89
+ In cases the sender ident is sufficiently specified, there is no
90
+ need to prompt the user before sending the series out.
91
70
- Will merge to 'next'.
92
93
+* fc/zsh-completion (2012-11-19) 2 commits
94
+ (merged to 'next' on 2012-11-26 at 48ebdc9)
95
+ + completion: start moving to the new zsh completion
96
+ + completion: add new zsh completion
97
73
-* mh/unify-xml-in-imap-send-and-http-push (2012-11-26) 8 commits
74
- - wrap_in_html(): process message in bulk rather than line-by-line
75
- - wrap_in_html(): use strbuf_addstr_xml_quoted()
76
- - imap-send: change msg_data from storing (char *, len) to storing strbuf
77
- - imap-send: correctly report errors reading from stdin
78
- - imap-send: store all_msgs as a strbuf
79
- - lf_to_crlf(): NUL-terminate msg_data::data
80
- - xml_entities(): use function strbuf_addstr_xml_quoted()
81
- - Add new function strbuf_add_xml_quoted()
98
+ Completion script revamped for zsh users.
99
100
84
-* pw/p4-various-fixes (2012-11-26) 6 commits
85
- - git p4: remove unneeded cmd initialization
86
- - git p4: fix labelDetails typo in exception
87
- - git p4 test: display unresolvable host error
88
- - git p4: catch p4 errors when streaming file contents
89
- - git p4: handle servers without move support
90
- - git p4: catch p4 describe errors
101
+* jc/doc-push-satellite (2012-11-27) 1 commit
102
+ (merged to 'next' on 2012-11-28 at 7114637)
103
+ + Documentation/git-push.txt: clarify the "push from satellite" workflow
104
92
- Will merge to 'next'.
105
+ Clarify what the example that pushes branches into remote-tracking
106
+ branches of another repository is trying to achieve (i.e. emulating
107
+ a fetch in reverse).
108
109
95
-* rr/t4041-cleanup (2012-11-27) 4 commits
96
- - t4041 (diff-submodule-option): modernize style
97
- - t4041 (diff-submodule-option): rewrite add_file() routine
98
- - t4041 (diff-submodule-option): parse digests sensibly
99
- - t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
110
+* jk/pickaxe-textconv (2012-10-28) 2 commits
111
+ (merged to 'next' on 2012-11-26 at 2c5b5c9)
112
+ + pickaxe: use textconv for -S counting
113
+ + pickaxe: hoist empty needle check
114
101
- As a clean-up, it still misses some.
115
+ Use textconv filters when searching with "log -S".
116
117
104
-* jc/doc-maintainer (2012-11-27) 1 commit
105
- - update "howto maintain git"
118
+* jk/send-email-sender-prompt (2012-11-28) 7 commits
119
+ (merged to 'next' on 2012-11-28 at a808921)
120
+ + t9001: check send-email behavior with implicit sender
121
+ + Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt
122
+ + t: add tests for "git var"
123
+ + ident: keep separate "explicit" flags for author and committer
124
+ + ident: make user_ident_explicitly_given static
125
+ + t7502: factor out autoident prerequisite
126
+ + test-lib: allow negation of prerequisites
127
+ (this branch uses fc/send-email-no-sender-prompt.)
128
107
- An early draft that is still incomplete.
129
+ General clean-ups in various areas, originally written to support a
130
+ patch that later turned out to be unneeded.
131
132
110
-* jc/doc-push-satellite (2012-11-27) 1 commit
111
- - Documentation/git-push.txt: clarify the "push from satellite" workflow
133
+* jl/submodule-rm (2012-11-23) 1 commit
134
+ (merged to 'next' on 2012-11-28 at 0e4115f)
135
+ + Teach rm to remove submodules when given with a trailing '/'
136
113
- Will merge to 'next'.
137
+ Finishing touches to "git rm $submodule" that removes the working
138
+ tree of a submodule.
139
140
116
-* jk/fsck-dot-in-trees (2012-11-28) 1 commit
117
- - fsck: warn about '.' and '..' in trees
141
+* km/send-email-remove-cruft-in-address (2012-11-26) 5 commits
142
+ (merged to 'next' on 2012-11-28 at 2688772)
143
+ + git-send-email: allow edit invalid email address
144
+ + git-send-email: ask what to do with an invalid email address
145
+ + git-send-email: remove invalid addresses earlier
146
+ + git-send-email: fix fallback code in extract_valid_address()
147
+ + git-send-email: remove garbage after email address
148
119
- Will merge to 'next'.
149
+ Garbage after e-mail address on Cc: in the patch breaks the
150
+ transmission of it over send-email.
151
152
153
* lt/diff-stat-show-0-lines (2012-11-27) 6 commits
123
- - diff --shortstat: do not count "unmerged" entries
124
- - diff --stat: do not count "unmerged" entries
125
- - diff --stat: move the "total count" logic to the last loop
126
- - diff --stat: use "file" temporary variable to refer to data->files[i]
127
- - diff --stat: status of unmodified pair in diff-q is not zero
128
- - test: add failing tests for "diff --stat" to t4049
154
+ (merged to 'next' on 2012-11-28 at de89eed)
155
+ + diff --shortstat: do not count "unmerged" entries
156
+ + diff --stat: do not count "unmerged" entries
157
+ + diff --stat: move the "total count" logic to the last loop
158
+ + diff --stat: use "file" temporary variable to refer to data->files[i]
159
+ + diff --stat: status of unmodified pair in diff-q is not zero
160
+ + test: add failing tests for "diff --stat" to t4049
161
130
- Will merge to 'next'.
162
+ "git diff --stat" miscounted the total number of changed lines when
163
+ binary files were involved and hidden beyond --stat-count. It also
164
+ miscounted the total number of changed files when there were
165
+ unmerged paths.
166
167
133
-* mh/doc-remote-helpers (2012-11-27) 6 commits
134
- - git-remote-helpers.txt: clarify options & ref list attributes
135
- - git-remote-helpers.txt: clarify command <-> capability correspondences
136
- - git-remote-helpers.txt: rearrange description of capabilities
137
- - git-remote-helpers.txt: minor grammar fix
138
- - git-remote-helpers.txt: document missing capabilities
139
- - git-remote-helpers.txt: document invocation before input format
168
+* mk/complete-tcsh (2012-11-27) 1 commit
169
+ (merged to 'next' on 2012-11-28 at 5528439)
170
+ + Support for git aliasing for tcsh completion
171
141
- Need comment and Ack from people who have worked on remote-helpers
142
- before this goes forward.
172
+ Completion script revamped for tcsh users.
173
174
145
-* mh/pthreads-autoconf (2012-11-27) 1 commit
146
- - configure.ac: fix pthreads detection on Mac OS X
175
+* mm/status-push-pull-advise (2012-11-16) 1 commit
176
+ (merged to 'next' on 2012-11-26 at ed40d5e)
177
+ + status: add advice on how to push/pull to tracking branch
178
148
- Will merge to 'next'.
179
+ When "git checkout" checks out a branch, it tells the user how far
180
+ behind (or ahead) the new branch is relative to the remote tracking
181
+ branch it builds upon. The message now also advises how to sync
182
+ them up by pushing or pulling.
183
184
151
-* mk/complete-tcsh (2012-11-27) 1 commit
152
- - Support for git aliasing for tcsh completion
185
+* pp/gitweb-config-underscore (2012-11-21) 1 commit
186
+ (merged to 'next' on 2012-11-28 at fc9bf5f)
187
+ + gitweb: make remote_heads config setting work
188
154
- Will merge to 'next'.
189
+ The key "gitweb.remote_heads" is not legal git config; this maps it to
190
+ "gitweb.remoteheads".
191
+
192
+
193
+* pw/p4-various-fixes (2012-11-26) 6 commits
194
+ (merged to 'next' on 2012-11-28 at 1a6f9a9)
195
+ + git p4: remove unneeded cmd initialization
196
+ + git p4: fix labelDetails typo in exception
197
+ + git p4 test: display unresolvable host error
198
+ + git p4: catch p4 errors when streaming file contents
199
+ + git p4: handle servers without move support
200
+ + git p4: catch p4 describe errors
201
202
--------------------------------------------------
203
[Stalled]
@@ -190,21 +236,6 @@ repositories listed at
236
Needs review by folks interested in cvsserver.
237
238
193
-* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
194
- - config: exit on error accessing any config file
195
- - doc: advertise GIT_CONFIG_NOSYSTEM
196
- - config: treat user and xdg config permission problems as errors
197
- - config, gitignore: failure to access with ENOTDIR is ok
198
-
199
- An RFC to deal with a situation where .config/git is a file and we
200
- notice .config/git/config is not readable due to ENOTDIR, not
201
- ENOENT; I think a bit more refactored approach to consistently
202
- address permission errors across config, exclude and attrs is
203
- desirable. Don't we also need a check for an opposite situation
204
- where we open .config/git/config or .gitattributes for reading but
205
- they turn out to be directories?
206
-
207
-
239
* as/check-ignore (2012-11-08) 14 commits
240
- t0007: fix tests on Windows
241
- Documentation/check-ignore: we show the deciding match, not the first
@@ -250,8 +281,8 @@ repositories listed at
281
* fc/remote-testgit-feature-done (2012-10-29) 1 commit
282
- remote-testgit: properly check for errors
283
253
- Is this still in "Needs review" state? Are people involved in the
254
- remote interface happy with this change?
284
+ Needs review and Ack (or Nack) from people involved in the remote
285
+ helper interface for this to move forward.
286
287
288
* rc/maint-complete-git-p4 (2012-09-24) 1 commit
@@ -369,6 +400,92 @@ repositories listed at
400
--------------------------------------------------
401
[Cooking]
402
403
+* bc/append-signed-off-by (2012-11-26) 11 commits
404
+ - Unify appending signoff in format-patch, commit and sequencer
405
+ - format-patch: update append_signoff prototype
406
+ - format-patch: stricter S-o-b detection
407
+ - t4014: more tests about appending s-o-b lines
408
+ - sequencer.c: teach append_signoff to avoid adding a duplicate newline
409
+ - sequencer.c: teach append_signoff how to detect duplicate s-o-b
410
+ - sequencer.c: always separate "(cherry picked from" from commit body
411
+ - sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
412
+ - t/t3511: add some tests of 'cherry-pick -s' functionality
413
+ - t/test-lib-functions.sh: allow to specify the tag name to test_commit
414
+ - sequencer.c: remove broken support for rfc2822 continuation in footer
415
+
416
+ Expecting a re-roll after a review.
417
+
418
+
419
+* mh/unify-xml-in-imap-send-and-http-push (2012-11-29) 8 commits
420
+ - wrap_in_html(): process message in bulk rather than line-by-line
421
+ - wrap_in_html(): use strbuf_addstr_xml_quoted()
422
+ - imap-send: change msg_data from storing (ptr, len) to storing strbuf
423
+ - imap-send: correctly report errors reading from stdin
424
+ - imap-send: store all_msgs as a strbuf
425
+ - lf_to_crlf(): NUL-terminate msg_data::data
426
+ - xml_entities(): use function strbuf_addstr_xml_quoted()
427
+ - Add new function strbuf_add_xml_quoted()
428
+
429
+ Will merge to 'next'.
430
+
431
+
432
+* rr/t4041-cleanup (2012-11-27) 4 commits
433
+ - t4041 (diff-submodule-option): modernize style
434
+ - t4041 (diff-submodule-option): rewrite add_file() routine
435
+ - t4041 (diff-submodule-option): parse digests sensibly
436
+ - t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
437
+
438
+ As a clean-up, it still misses some.
439
+ Expecting a re-roll.
440
+
441
+
442
+* jc/doc-maintainer (2012-11-27) 1 commit
443
+ - update "howto maintain git"
444
+
445
+ An early draft that is still incomplete.
446
+
447
+
448
+* jk/fsck-dot-in-trees (2012-11-28) 2 commits
449
+ (merged to 'next' on 2012-11-28 at 519dabc)
450
+ + fsck: warn about ".git" in trees
451
+ + fsck: warn about '.' and '..' in trees
452
+
453
+ Will cook in 'next'.
454
+
455
+
456
+* mh/doc-remote-helpers (2012-11-27) 6 commits
457
+ - git-remote-helpers.txt: clarify options & ref list attributes
458
+ - git-remote-helpers.txt: clarify command <-> capability correspondences
459
+ - git-remote-helpers.txt: rearrange description of capabilities
460
+ - git-remote-helpers.txt: minor grammar fix
461
+ - git-remote-helpers.txt: document missing capabilities
462
+ - git-remote-helpers.txt: document invocation before input format
463
+
464
+ Need comment and Ack from people who have worked on remote-helpers
465
+ before this goes forward.
466
+
467
+
468
+* mh/pthreads-autoconf (2012-11-27) 1 commit
469
+ (merged to 'next' on 2012-11-28 at 780600e)
470
+ + configure.ac: fix pthreads detection on Mac OS X
471
+
472
+ Will cook in 'next'.
473
+
474
+
475
+* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
476
+ (merged to 'next' on 2012-11-28 at 43d51c2)
477
+ + config: exit on error accessing any config file
478
+ + doc: advertise GIT_CONFIG_NOSYSTEM
479
+ + config: treat user and xdg config permission problems as errors
480
+ + config, gitignore: failure to access with ENOTDIR is ok
481
+
482
+ An RFC to deal with a situation where .config/git is a file and we
483
+ notice .config/git/config is not readable due to ENOTDIR, not
484
+ ENOENT.
485
+
486
+ Will cook in 'next'.
487
+
488
+
489
* mh/ceiling (2012-10-29) 8 commits
490
(merged to 'next' on 2012-11-26 at d1ce76a)
491
+ string_list_longest_prefix(): remove function
@@ -390,34 +507,9 @@ repositories listed at
507
Will cook in 'next'.
508
509
393
-* jk/send-email-sender-prompt (2012-11-28) 7 commits
394
- - t9001: check send-email behavior with implicit sender
395
- - Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt
396
- - t: add tests for "git var"
397
- - ident: keep separate "explicit" flags for author and committer
398
- - ident: make user_ident_explicitly_given static
399
- - t7502: factor out autoident prerequisite
400
- - test-lib: allow negation of prerequisites
401
- (this branch uses fc/send-email-no-sender-prompt.)
402
-
403
- Resurrected only the internal clean-up part.
404
-
405
- Will merge to 'next'.
406
-
407
-
408
-* fc/fast-export-fixes (2012-11-27) 25 commits
409
- - fast-export: trivial cleanups
410
- - fast-export: refactor get_tags_and_duplicates()
411
- - fast-export: make extra_refs global
412
- - transport-helper: fix push without marks
413
- - transport-helper: fix pushing with straight refspec
414
- - transport-helper: fix push without refspec
415
- - transport-helper: trivial code shuffle
416
- - [squash] earlier breakages in t5800 fixed by the previous
417
- - fast-export: don't handle uninteresting refs
418
- - transport-helper: update remote helper namespace
419
- - [squash] previous breaks t5800
510
+* fc/fast-export-fixes (2012-11-29) 15 commits
511
- fast-export: make sure updated refs get updated
512
+ - fast-export: don't handle uninteresting refs
513
- fast-export: fix comparison in tests
514
- fast-export: trivial cleanup
515
- remote-testgit: implement the "done" feature manually
@@ -432,19 +524,7 @@ repositories listed at
524
- remote-testgit: fix direction of marks
525
- fast-export: avoid importing blob marks
526
435
- It needs a bit of re-roll or reorder to keep things bisectable, at
436
- least, and with log message here and there to justify non-trivial
437
- bits with something better than unsubstantiated "this is trivial"
438
- claim. Overall, the series looked OK.
439
-
440
-
441
-* pp/gitweb-config-underscore (2012-11-21) 1 commit
442
- - gitweb: make remote_heads config setting work
443
-
444
- The key "gitweb.remote_heads" is not legal git config; this maps it to
445
- "gitweb.remoteheads".
446
-
447
- Will merge to 'next'.
527
+ Will merge to (and cook in) 'next'.
528
529
530
* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
@@ -467,21 +547,6 @@ repositories listed at
547
Will merge to 'next'.
548
549
470
-* mm/status-push-pull-advise (2012-11-16) 1 commit
471
- (merged to 'next' on 2012-11-26 at ed40d5e)
472
- + status: add advice on how to push/pull to tracking branch
473
-
474
- Will merge to 'master' in the seventh batch.
475
-
476
-
477
-* fc/zsh-completion (2012-11-19) 2 commits
478
- (merged to 'next' on 2012-11-26 at 48ebdc9)
479
- + completion: start moving to the new zsh completion
480
- + completion: add new zsh completion
481
-
482
- Will merge to 'master' in the seventh batch.
483
-
484
-
550
* nd/wildmatch (2012-11-20) 14 commits
551
(merged to 'next' on 2012-11-21 at 151288f)
552
+ test-wildmatch: avoid Windows path mangling
@@ -512,32 +577,6 @@ repositories listed at
577
Will cook in 'next'.
578
579
515
-* fc/completion-test-simplification (2012-11-16) 6 commits
516
- - completion: simplify __gitcomp() test helper
517
- - completion: refactor __gitcomp related tests
518
- - completion: consolidate test_completion*() tests
519
- - completion: simplify tests using test_completion_long()
520
- - completion: standardize final space marker in tests
521
- - completion: add comment for test_completion()
522
-
523
- Clean up completion tests. Use of conslidated helper may make
524
- instrumenting one particular test during debugging of the test
525
- itself, but I think that issue should be addressed in some other
526
- way (e.g. making sure individual tests in 9902 can be skipped).
527
-
528
- Will merge to 'next'.
529
-
530
-
531
-* jk/pickaxe-textconv (2012-10-28) 2 commits
532
- (merged to 'next' on 2012-11-26 at 2c5b5c9)
533
- + pickaxe: use textconv for -S counting
534
- + pickaxe: hoist empty needle check
535
-
536
- Use textconv filters when searching with "log -S".
537
-
538
- Will merge to 'master' in the seventh batch.
539
-
540
-
580
* fc/remote-bzr (2012-11-28) 10 commits
581
- (fixup) test-bzr.sh: fix multi-line string assignment
582
- remote-bzr: detect local repositories
@@ -550,41 +589,10 @@ repositories listed at
589
- remote-bzr: add support for pushing
590
- Add new remote-bzr transport helper
591
553
- New remote helper for bzr (v3). With minor fixes this may be ready
592
+ New remote helper for bzr (v3). With minor fixes, this may be ready
593
for 'next'.
594
595
557
-* fc/remote-hg (2012-11-27) 22 commits
558
- (merged to 'next' on 2012-11-28 at f805784)
559
- + remote-hg: fix for older versions of python
560
- + remote-hg: fix for files with spaces
561
- (merged to 'next' on 2012-11-18 at 4a4f2e4)
562
- + remote-hg: avoid bad refs
563
- + remote-hg: try the 'tip' if no checkout present
564
- + remote-hg: fix compatibility with older versions of hg
565
- + remote-hg: add missing config for basic tests
566
- + remote-hg: the author email can be null
567
- + remote-hg: add option to not track branches
568
- + remote-hg: add extra author test
569
- + remote-hg: add tests to compare with hg-git
570
- + remote-hg: add bidirectional tests
571
- + test-lib: avoid full path to store test results
572
- + remote-hg: add basic tests
573
- + remote-hg: fake bookmark when there's none
574
- + remote-hg: add compat for hg-git author fixes
575
- + remote-hg: add support for hg-git compat mode
576
- + remote-hg: match hg merge behavior
577
- + remote-hg: make sure the encoding is correct
578
- + remote-hg: add support to push URLs
579
- + remote-hg: add support for remote pushing
580
- + remote-hg: add support for pushing
581
- + Add new remote-hg transport helper
582
-
583
- New remote helper for hg.
584
-
585
- Will merge to 'master'.
586
-
587
-
596
* cr/push-force-tag-update (2012-11-26) 7 commits
597
- push: clarify rejection of update to non-commit-ish
598
- push: require force for annotated tags
@@ -597,6 +605,7 @@ repositories listed at
605
Require "-f" for push to update a tag, even if it is a fast-forward.
606
607
With a minor tweak, I think this is getting ready for 'next'.
608
+ Expecting a re-roll.
609
610
--------------------------------------------------
611
[Discarded]