Revision | d1c4d787cf0f45aae6d7779e9683fa83bbdcbe80 (tree) |
---|---|
Time | 2011-02-22 20:16:36 |
Author | at0fk |
Commiter | at0fk |
Rebase patches for upcoming 1.8
@@ -2,8 +2,8 @@ | ||
2 | 2 | # User Face |
3 | 3 | # Date 1241705377 -7200 |
4 | 4 | # Branch stable |
5 | -# Node ID bb9797a1bf78558b7716438e6de184feada08945 | |
6 | -# Parent 333421b9e0f96c7bc788e5667c146a58a9440a55 | |
5 | +# Node ID 606403beb365145d4e34e5b2f605cad0eb1c9d6c | |
6 | +# Parent 9f2c407caf348c613ff7b769af315f3ee9d5ebab | |
7 | 7 | imported patch Extdiff_with_revisions |
8 | 8 | |
9 | 9 | diff --git a/hgext/extdiff.py b/hgext/extdiff.py |
@@ -2,14 +2,14 @@ | ||
2 | 2 | # User at0fk |
3 | 3 | # Date 1274086750 -7200 |
4 | 4 | # Branch stable |
5 | -# Node ID 56fe8216b31207dcc31286e4dc968004db237d70 | |
6 | -# Parent 8901cfde7f814edac4a2565590c887a4357d3a5f | |
5 | +# Node ID 204a443b858bb9f067f6e28c84c6da4ddcbcef1e | |
6 | +# Parent 606403beb365145d4e34e5b2f605cad0eb1c9d6c | |
7 | 7 | Support for linked subrepos in contrast to direct nested subrepos. |
8 | 8 | |
9 | 9 | diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py |
10 | 10 | --- a/mercurial/subrepo.py |
11 | 11 | +++ b/mercurial/subrepo.py |
12 | -@@ -93,7 +93,7 @@ | |
12 | +@@ -102,7 +102,7 @@ | |
13 | 13 | for s, l in s1.items(): |
14 | 14 | a = sa.get(s, nullstate) |
15 | 15 | ld = l # local state with possible dirty flag for compares |
@@ -18,7 +18,7 @@ | ||
18 | 18 | ld = (l[0], l[1] + "+") |
19 | 19 | if wctx == actx: # overwrite |
20 | 20 | a = ld |
21 | -@@ -464,6 +464,87 @@ | |
21 | +@@ -508,6 +508,87 @@ | |
22 | 22 | ctx = self._repo[rev] |
23 | 23 | return ctx.flags(name) |
24 | 24 |
@@ -106,9 +106,9 @@ | ||
106 | 106 | |
107 | 107 | class svnsubrepo(abstractsubrepo): |
108 | 108 | def __init__(self, ctx, path, state): |
109 | -@@ -579,4 +660,5 @@ | |
110 | - types = { | |
109 | +@@ -995,4 +1076,5 @@ | |
111 | 110 | 'hg': hgsubrepo, |
112 | 111 | 'svn': svnsubrepo, |
112 | + 'git': gitsubrepo, | |
113 | 113 | + 'link': linksubrepo, |
114 | 114 | } |
@@ -2,8 +2,8 @@ | ||
2 | 2 | # User at0fk |
3 | 3 | # Date 1288684294 -3600 |
4 | 4 | # Branch stable |
5 | -# Node ID 2a482fa6f8df93361adbc801fdc98863938d40e2 | |
6 | -# Parent 56fe8216b31207dcc31286e4dc968004db237d70 | |
5 | +# Node ID 387e32071387a03408b3cb1f80c66e4df7d60342 | |
6 | +# Parent f881ea6994943bb5b132b6f86145f6fc52b0faf1 | |
7 | 7 | Rebase: keep empty changesets with '--keepmeta' option. |
8 | 8 | |
9 | 9 | Rebase drops empty changesets due to localrepo.commit() not commiting |
@@ -121,7 +121,7 @@ | ||
121 | 121 | diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py |
122 | 122 | --- a/mercurial/localrepo.py |
123 | 123 | +++ b/mercurial/localrepo.py |
124 | -@@ -916,8 +916,8 @@ | |
124 | +@@ -967,8 +967,8 @@ | |
125 | 125 | elif f not in self.dirstate: |
126 | 126 | fail(f, _("file not tracked!")) |
127 | 127 |
@@ -2,8 +2,8 @@ | ||
2 | 2 | # User Face |
3 | 3 | # Date 1274086750 -7200 |
4 | 4 | # Branch stable |
5 | -# Node ID 004cbc47de7130ed3bf7d8ed6fe71ca3a6b021fe | |
6 | -# Parent 27bb8059781a80ae93b50be7c7afdae4b412c5ae | |
5 | +# Node ID f881ea6994943bb5b132b6f86145f6fc52b0faf1 | |
6 | +# Parent 204a443b858bb9f067f6e28c84c6da4ddcbcef1e | |
7 | 7 | Adding --subrepos option so "hg tag" tags subrepos recursively. |
8 | 8 | |
9 | 9 | Linked subrepos are not taken into account. |
@@ -19,7 +19,7 @@ | ||
19 | 19 | |
20 | 20 | # Commands start here, listed alphabetically |
21 | 21 | |
22 | -@@ -3679,6 +3680,8 @@ | |
22 | +@@ -3874,6 +3875,8 @@ | |
23 | 23 | Returns 0 on success. |
24 | 24 | """ |
25 | 25 |
@@ -28,7 +28,7 @@ | ||
28 | 28 | rev_ = "." |
29 | 29 | names = [t.strip() for t in (name1,) + names] |
30 | 30 | if len(names) != len(set(names)): |
31 | -@@ -3731,6 +3734,17 @@ | |
31 | +@@ -3930,6 +3933,17 @@ | |
32 | 32 | |
33 | 33 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
34 | 34 |
@@ -46,7 +46,7 @@ | ||
46 | 46 | def tags(ui, repo): |
47 | 47 | """list repository tags |
48 | 48 | |
49 | -@@ -4485,7 +4499,7 @@ | |
49 | +@@ -4705,7 +4719,7 @@ | |
50 | 50 | ('e', 'edit', None, _('edit commit message')), |
51 | 51 | ('m', 'message', '', |
52 | 52 | _('use <text> as commit message'), _('TEXT')), |
@@ -1,6 +1,9 @@ | ||
1 | 1 | # HG changeset patch |
2 | -# Parent 0c7e3e7d473e0b0f8e0a5b7f37c3e552470384bc | |
3 | 2 | # User at0fk |
3 | +# Date 1298373149 -3600 | |
4 | +# Branch stable | |
5 | +# Node ID 2712e980358addb88de8ab237e64401fa555f5af | |
6 | +# Parent 387e32071387a03408b3cb1f80c66e4df7d60342 | |
4 | 7 | hgweb: fix "$'" encoding problem in graph page |
5 | 8 | |
6 | 9 | While shortlog and changelog display changeset description-lines containing the characters "$'" just fine, |
@@ -9,7 +12,7 @@ | ||
9 | 12 | diff --git a/mercurial/templates/gitweb/graph.tmpl b/mercurial/templates/gitweb/graph.tmpl |
10 | 13 | --- a/mercurial/templates/gitweb/graph.tmpl |
11 | 14 | +++ b/mercurial/templates/gitweb/graph.tmpl |
12 | -@@ -76,10 +76,12 @@ | |
15 | +@@ -77,10 +77,12 @@ | |
13 | 16 | var left = (this.columns + 1) * this.bg_height; |
14 | 17 | var nstyle = 'padding-left: ' + left + 'px;'; |
15 | 18 | var item = revlink.replace(/_STYLE/, nstyle); |
@@ -26,7 +29,7 @@ | ||
26 | 29 | diff --git a/mercurial/templates/monoblue/graph.tmpl b/mercurial/templates/monoblue/graph.tmpl |
27 | 30 | --- a/mercurial/templates/monoblue/graph.tmpl |
28 | 31 | +++ b/mercurial/templates/monoblue/graph.tmpl |
29 | -@@ -73,10 +73,12 @@ | |
32 | +@@ -74,10 +74,12 @@ | |
30 | 33 | var left = (this.columns + 1) * this.bg_height; |
31 | 34 | var nstyle = 'padding-left: ' + left + 'px;'; |
32 | 35 | var item = revlink.replace(/_STYLE/, nstyle); |
@@ -43,7 +46,7 @@ | ||
43 | 46 | diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl |
44 | 47 | --- a/mercurial/templates/paper/graph.tmpl |
45 | 48 | +++ b/mercurial/templates/paper/graph.tmpl |
46 | -@@ -84,10 +84,12 @@ | |
49 | +@@ -87,10 +87,12 @@ | |
47 | 50 | var left = (this.columns + 1) * this.bg_height; |
48 | 51 | var nstyle = 'padding-left: ' + left + 'px;'; |
49 | 52 | var item = revlink.replace(/_STYLE/, nstyle); |
@@ -60,7 +63,7 @@ | ||
60 | 63 | diff --git a/mercurial/templates/spartan/graph.tmpl b/mercurial/templates/spartan/graph.tmpl |
61 | 64 | --- a/mercurial/templates/spartan/graph.tmpl |
62 | 65 | +++ b/mercurial/templates/spartan/graph.tmpl |
63 | -@@ -68,10 +68,12 @@ | |
66 | +@@ -69,10 +69,12 @@ | |
64 | 67 | var left = (this.columns + 1) * this.bg_height; |
65 | 68 | var nstyle = 'padding-left: ' + left + 'px;'; |
66 | 69 | var item = revlink.replace(/_STYLE/, nstyle); |
@@ -2,4 +2,4 @@ | ||
2 | 2 | Linksubrepo |
3 | 3 | Tag_walks_subrepos |
4 | 4 | Rebase_fix_changeset_drop |
5 | -fixhgwebstyles | |
\ No newline at end of file | ||
5 | +fixhgwebstyles |