1
Index: mercurial-0.7/contrib/hgit
2
===================================================================
3
--- mercurial-0.7.orig/contrib/hgit 2005-09-23 10:34:30.000000000 +0200
4
+++ mercurial-0.7/contrib/hgit 2005-09-23 10:42:15.000000000 +0200
6
# This software may be used and distributed according to the terms
7
# of the GNU General Public License, incorporated herein by reference.
9
-import time, sys, signal
10
+import time, sys, signal, os
11
from mercurial import hg, mdiff, fancyopts, commands, ui, util
13
def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
17
# TODO get file permissions
18
- print ":100664 100664 %s %s M\t%s\t%s" % (hg.hex(mmap[f]),
19
+ print ":100664 100664 %s %s M\t%s\t%s" % (hg.hex(mmap[f]),
20
hg.hex(mmap2[f]), f, f)
22
print ":000000 100664 %s %s N\t%s\t%s" % (empty, hg.hex(mmap2[f]), f, f)
24
committer = lines[-1].split(': ')[1].rstrip()
26
committer = "%s %s %s" % (changes[1], date, date_ar[1])
29
print "author %s %s %s" % (changes[1], date, date_ar[1])
30
print "committer %s" % (committer)
33
yield (i + x, full != None and l[x] or None)
38
# calculate and return the reachability bitmask for sha
39
def is_reachable(ar, reachable, sha):
42
copy = [x for x in revs]
43
revtree(copy, repo, full, opts['max_count'], opts['parents'])
45
+def view(ui, repo, *etc):
46
+ "start interactive history viewer"
48
+ os.system("hgk " + " ".join(etc))
51
- "git-diff-tree": (difftree, [('p', 'patch', None, 'generate patch'),
52
+ "view": (view, [], 'hg view'),
53
+ "debug-diff-tree": (difftree, [('p', 'patch', None, 'generate patch'),
54
('r', 'recursive', None, 'recursive'),
55
('P', 'pretty', None, 'pretty'),
56
('s', 'stdin', None, 'stdin'),
57
('C', 'copy', None, 'detect copies'),
58
('S', 'search', "", 'search')],
59
"hg git-diff-tree [options] node1 node2"),
60
- "git-cat-file": (catfile, [('s', 'stdin', None, 'stdin')],
61
- "hg cat-file [options] type file"),
62
- "git-merge-base": (base, [], "hg git-merge-base node node"),
63
- "git-rev-list": (revlist, [('H', 'header', None, 'header'),
64
+ "debug-cat-file": (catfile, [('s', 'stdin', None, 'stdin')],
65
+ "hg debug-cat-file [options] type file"),
66
+ "debug-merge-base": (base, [], "hg debug-merge-base node node"),
67
+ "debug-rev-list": (revlist, [('H', 'header', None, 'header'),
68
('t', 'topo-order', None, 'topo-order'),
69
('p', 'parents', None, 'parents'),
70
('n', 'max-count', 0, 'max-count')],
71
- "hg git-rev-list [options] revs"),
72
+ "hg debug-rev-list [options] revs"),
75
def reposetup(ui, repo):
76
Index: mercurial-0.7/contrib/hgk
77
===================================================================
78
--- mercurial-0.7.orig/contrib/hgk 2005-09-16 23:02:33.000000000 +0200
79
+++ mercurial-0.7/contrib/hgk 2005-09-23 10:41:53.000000000 +0200
83
set parse_args [concat --default HEAD $rargs]
84
- set parsed_args [split [eval exec hg git-rev-parse $parse_args] "\n"]
85
+ set parsed_args [split [eval exec hg debug-rev-parse $parse_args] "\n"]
87
# if git-rev-parse failed for some reason...
90
set parsed_args $rargs
93
- set commfd [open "|hg git-rev-list --header --topo-order --parents $parsed_args" r]
94
+ set commfd [open "|hg debug-rev-list --header --topo-order --parents $parsed_args" r]
96
- puts stderr "Error executing hg git-rev-list: $err"
97
+ puts stderr "Error executing hg debug-rev-list: $err"
102
if {[string length $shortcmit] > 80} {
103
set shortcmit "[string range $shortcmit 0 80]..."
105
- error_popup "Can't parse hg git-rev-list output: {$shortcmit}"
106
+ error_popup "Can't parse hg debug-rev-list output: {$shortcmit}"
109
set id [lindex $ids 0]
113
proc readcommit {id} {
114
- if [catch {set contents [exec hg git-cat-file commit $id]}] return
115
+ if [catch {set contents [exec hg debug-cat-file commit $id]}] return
116
parsecommit $id $contents 0 {}
119
@@ -1708,7 +1708,7 @@
123
- set f [open [list | hg git-diff-tree --stdin -s -r -S$findstring \
124
+ set f [open [list | hg debug-diff-tree --stdin -s -r -S$findstring \
127
error_popup "Error starting search process: $err"
128
@@ -1811,7 +1811,7 @@
129
# start off a git-diff-tree process if needed
130
if {$diffsneeded ne {}} {
132
- set df [open [list | hg git-diff-tree -r --stdin << $diffsneeded] r]
133
+ set df [open [list | hg debug-diff-tree -r --stdin << $diffsneeded] r]
135
error_popup "Error starting search process: $err"
137
@@ -1843,7 +1843,7 @@
138
if {[catch {close $df} err]} {
141
- error_popup "Error in hg git-diff-tree: $err"
142
+ error_popup "Error in hg debug-diff-tree: $err"
143
} elseif {[info exists findids]} {
146
@@ -2113,7 +2113,7 @@
148
$ctext insert end "\n"
153
if {[info exists parents($id)]} {
154
foreach p $parents($id) {
155
@@ -2232,7 +2232,7 @@
159
- set gca [exec hg git-merge-base $gca $id]
160
+ set gca [exec hg debug-merge-base $gca $id]
164
@@ -2320,7 +2320,7 @@
165
catch {unset grouphunks}
167
foreach p $parents($diffmergeid) {
168
- set cmd [list | hg git-diff-tree -p $p $diffmergeid]
169
+ set cmd [list | hg debug-diff-tree -p $p $diffmergeid]
170
set cmd [concat $cmd $mergefilelist($diffmergeid)]
171
if {[catch {set f [open $cmd r]} err]} {
172
error_popup "Error getting diffs: $err"
173
@@ -2764,7 +2764,7 @@
175
set id [lindex $ids 0]
176
set p [lindex $ids 1]
177
- if [catch {set gdtf [open "|hg git-diff-tree -r $p $id" r]}] return
178
+ if [catch {set gdtf [open "|hg debug-diff-tree -r $p $id" r]}] return
179
fconfigure $gdtf -blocking 0
180
fileevent $gdtf readable [list gettreediffline $gdtf $ids]
182
@@ -2800,7 +2800,7 @@
183
set id [lindex $ids 0]
184
set p [lindex $ids 1]
185
set env(GIT_DIFF_OPTS) $diffopts
186
- set cmd [list | hg git-diff-tree -r -p -C $p $id]
187
+ set cmd [list | hg debug-diff-tree -r -p -C $p $id]
188
if {[catch {set bdf [open $cmd r]} err]} {
189
puts "error getting diffs: $err"
191
@@ -3387,7 +3387,7 @@
192
set oldid [$patchtop.fromsha1 get]
193
set newid [$patchtop.tosha1 get]
194
set fname [$patchtop.fname get]
195
- if {[catch {exec hg git-diff-tree -p $oldid $newid >$fname &} err]} {
196
+ if {[catch {exec hg debug-diff-tree -p $oldid $newid >$fname &} err]} {
197
error_popup "Error creating patch: $err"
199
catch {destroy $patchtop}
200
@@ -3608,7 +3608,7 @@
203
set diffopts "-U 5 -p"
204
-set wrcomcmd "hg git-diff-tree --stdin -p --pretty"
205
+set wrcomcmd "hg debug-diff-tree --stdin -p --pretty"
207
set mainfont {Helvetica 9}
208
set textfont {Courier 9}