Tracker: Patches

5 Added support for Mercurial (hg) source control. - ID: 1867700
Last Update: Settings changed ( dorothyr )

Added support for Mercurial (hg) source control. Mercurial is an
open-source distributed source control system, conceptually similar to
Git, Bazaar (bzr), Darcs, and the commercial system BitKeeper
(which tkdiff already supports).

While Mercurial already comes with a tkdiff wrapper called "hgdiff",
this script does not support arbitrary revisions in the way that the
actual hg diff command does (e.g. "hg diff -r2 -r5 filename). This
patch gives tkdiff support for all the revision numbers that "hg diff"
supports.

The code changes are small and mostly boilerplate, but I did add one
new procedure called "is-mercurial-repository". This was added
because mercurial uses a single ".hg" directory at the top-level
directory of a repository rather than having a directory at each
different directory inside the repository. The new procedure simply
traverses up the parent directories until it either finds a .hg
directory (indicating that we're in a Mercurial repository) or hits
the root directory (indicating that we're not).

Since the list of supported source control systems is getting large, I
alphabetized the list in the command-line help text and also modified
other parts of this help text to say things like "RCS, CVS, etc."
rather than exhaustively listing all the supported systems yet again.

More information on Mercurial can be found at
http://www.selenic.com/mercurial/wiki/ and
http://en.wikipedia.org/wiki/Mercurial_(software)


Damon McCormick ( damonmc ) - 2008-01-09 06:19:59 PST

5

Closed

Accepted

Nobody/Anonymous

None

None

Public


Comments ( 3 )

Date: 2011-09-11 02:47:32 PDT
Sender: ottxor

We apply this patch to tkdiff-4.1.4 in Gentoo Linux since 23 Dec 2008 and
have no reported problems so far!

It is also much better than my dirty hack (ID: 2144602).


Date: 2011-03-13 19:14:57 PDT
Sender: bukzor

I don't find an 'hgdiff' command in my installation. I'm using this patch
instead.


Date: 2011-03-13 19:06:21 PDT
Sender: https://www.google.com/accounts

Confirmed working. Please merge!


Attached File ( 1 )

Filename Description Download
tkdiff-hg.patch tkdiff-hg.patch based on tkdiff 4.14 revision 1.48 Download

Changes ( 7 )

Field Old Value Date By
close_date 2011-09-10 19:06 2011-12-02 20:19:19 PST dorothyr
allow_comments 1 2011-12-02 20:19:19 PST dorothyr
status_id Pending 2011-12-02 20:19:19 PST dorothyr
close_date - 2011-09-10 19:06:35 PDT dorothyr
resolution_id None 2011-09-10 19:06:35 PDT dorothyr
status_id Open 2011-09-10 19:06:35 PDT dorothyr
File Added 261472: tkdiff-hg.patch 2008-01-09 06:20:00 PST damonmc