mason@suse.com [Tue, 13 Sep 2005 19:33:10 -0500] rev 1239
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com [Tue, 13 Sep 2005 19:32:53 -0500] rev 1238
Add log -b to show the branch a specific revision lives in
This can be somewhat slow on very large repositories, so I didn't want
to include it in -v
--- hg.orig/mercurial/commands.py 2005-09-13 14:21:57.000000000 -0500
+++ hg/mercurial/commands.py 2005-09-13 18:55:52.000000000 -0500
@@ -1161,7 +1161,10 @@ def log(ui, repo, *pats, **opts):
du = dui(ui)
elif st == 'add':
du.bump(rev)
- show_changeset(du, repo, rev)
+ br = None
+ if opts['branch']:
+ br = repo.branchlookup([repo.changelog.node(rev)])
+ show_changeset(du, repo, rev, brinfo=br)
if opts['patch']:
changenode = repo.changelog.node(rev)
prev, other = repo.changelog.parents(changenode)
@@ -1743,6 +1746,7 @@ table = {
(log,
[('I', 'include', [], 'include path in search'),
('X', 'exclude', [], 'exclude path from search'),
+ ('b', 'branch', None, 'show branches'),
('r', 'rev', [], 'revision'),
('p', 'patch', None, 'show patch')],
'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
mason@suse.com [Tue, 13 Sep 2005 19:32:43 -0500] rev 1237
Fix off by one in convert-repo tags
--- crew.orig/contrib/convert-repo 2005-07-16 11:52:06.000000000 -0400
+++ crew/contrib/convert-repo 2005-09-02 02:58:14.000000000 -0400
@@ -86,9 +86,7 @@ class convert_git:
for f in os.listdir(self.path + "/.git/refs/tags"):
try:
h = file(self.path + "/.git/refs/tags/" + f).read().strip()
- p, a, d, m = self.getcommit(h)
- if not p: p = [h] # git is ugly, don't blame me
- tags[f] = p[0]
+ tags[f] = h
except:
pass
return tags
--
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
mpm@selenic.com [Tue, 13 Sep 2005 18:38:27 -0500] rev 1236
Fix bug with co -C across branches, update tests
mpm@selenic.com [Tue, 13 Sep 2005 14:23:43 -0500] rev 1235
Fix test-tag output for new abort message
mpm@selenic.com [Tue, 13 Sep 2005 14:22:48 -0500] rev 1234
Revert unrelated changes in previous commit
mpm@selenic.com [Tue, 13 Sep 2005 14:18:18 -0500] rev 1233
Fix abort message for clone
mpm@selenic.com [Tue, 13 Sep 2005 14:16:15 -0500] rev 1232
Revert some exception type changes in revlog
mpm@selenic.com [Fri, 09 Sep 2005 12:19:24 -0700] rev 1231
CONTRIBUTORS update
mpm@selenic.com [Fri, 09 Sep 2005 12:17:51 -0700] rev 1230
dirstate: two more stat -> lstat changes
mpm@selenic.com [Fri, 09 Sep 2005 11:47:13 -0700] rev 1229
Fix comment typo
mpm@selenic.com [Fri, 09 Sep 2005 11:46:35 -0700] rev 1228
Fix dangling symlink bug in dirstate walk code
Bryan O'Sullivan <bos@serpentine.com> [Fri, 09 Sep 2005 11:34:34 -0700] rev 1227
Replace sequences of {ui.warn, return 1} with raise of util.Abort.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 09 Sep 2005 10:59:05 -0700] rev 1226
patchbomb: add TLS and SMTP AUTH support.
Original patch from Lee Cantey <lcantey@gmail.com>.
mpm@selenic.com [Thu, 08 Sep 2005 17:09:31 -0700] rev 1225
Add --debugger global option
With this option, hg will drop into the Python debugger on execution.
Running 'continue' will execute normally, and the debugger will be
reinvoked if an exception is raised.
mpm@selenic.com [Thu, 08 Sep 2005 15:01:33 -0700] rev 1224
Fix Windows status problem from new dirstate walk code
mpm@selenic.com [Thu, 08 Sep 2005 12:17:24 -0700] rev 1223
Update test-help for bundle/unbundle
mpm@selenic.com [Thu, 08 Sep 2005 12:16:31 -0700] rev 1222
Fix missing docstring for unbundle
TK Soh <teekaysoh@yahoo.com> [Thu, 08 Sep 2005 12:10:59 -0700] rev 1221
clone: directory names take precedence over symbolic names
If source matches both a directory name and a symbolic
name to repo, the directory will be taken.
mpm@selenic.com [Thu, 08 Sep 2005 12:10:43 -0700] rev 1220
import: fix bug in mail-format detection
mpm@selenic.com [Thu, 08 Sep 2005 10:49:33 -0700] rev 1219
hgweb: fix scope for RepoError
mpm@selenic.com [Thu, 08 Sep 2005 01:27:25 -0700] rev 1218
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com [Thu, 08 Sep 2005 00:13:52 -0700] rev 1217
Add missing import for hgwebdir
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 08 Sep 2005 09:11:17 +0200] rev 1216
Cleanup of tabs and trailing spaces in documentation.
mpm@selenic.com [Wed, 07 Sep 2005 23:57:59 -0700] rev 1215
Add reporting instructions to unknown exception backtraces
mpm@selenic.com [Wed, 07 Sep 2005 23:38:28 -0700] rev 1214
Smarter handling of revlog key errors
Use RevlogError for reporting exceptions
Catch and report RevlogError exceptions at the command parser
mpm@selenic.com [Wed, 07 Sep 2005 23:13:12 -0700] rev 1213
Clean up hgweb imports
Use demandloading
Pull function-local imports up to demandload
Scope hg and ui bits
mpm@selenic.com [Wed, 07 Sep 2005 20:50:23 -0700] rev 1212
Change grep -e to grep --all
We want to reserve -e for future use and grep compatibility.
I've changed every-match to all out of a general preference for
shorter long option names where short options don't exist.
mpm@selenic.com [Wed, 07 Sep 2005 20:09:16 -0700] rev 1211
Fold import -m option into import -f
mpm@selenic.com [Wed, 07 Sep 2005 20:05:22 -0700] rev 1210
Revert silly TypeError change
mpm@selenic.com [Wed, 07 Sep 2005 19:37:11 -0700] rev 1209
Tighten up clone locking
Add a lock on the destination, expand comment on source lock
mpm@selenic.com [Wed, 07 Sep 2005 19:30:23 -0700] rev 1208
Clean up local clone file list
We now use an explicit list of files to copy during clone so that we
don't copy anything we shouldn't.
mpm@selenic.com [Wed, 07 Sep 2005 19:21:38 -0700] rev 1207
Rewrite copytree as copyfiles
This inverts the logic of copytree to allow copying single files at
the top level.
mpm@selenic.com [Wed, 07 Sep 2005 19:16:36 -0700] rev 1206
Redo local clone hgrc fix
We shouldn't copy hgrc on a local clone, nor localtags. Behavior
should be identical to a remote clone.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 15:47:59 -0700] rev 1205
Write out hgrc properly.
Previously, we simply appended to the hgrc file, which meant that it
ended up containing multiple "paths" sections. Now, we only modify
"paths.default".
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 15:12:20 -0700] rev 1204
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:48:33 -0700] rev 1203
Get test-commit to exit cleanly.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:47:02 -0700] rev 1202
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:45:03 -0700] rev 1201
revlog: raise informative exception if file is missing.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:21:53 -0700] rev 1200
Minor cleanups.
Eric Hopper <hopper@omnifarious.org> [Sun, 04 Sep 2005 14:11:51 -0700] rev 1199
Created a class in util called chunkbuffer that buffers reads from an
iterator over strings (aka chunks).
Also added to util (for future use) is a generator function that
iterates over a file n bytes at a time.
Lastly, localrepo was changed to use this new chunkbuffer class when
reading changegroups form the local repository.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:52:39 -0700] rev 1198
Add test output.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:51:53 -0700] rev 1197
Date validation must check for 32-bit width. Don't use assert to check.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:28:15 -0700] rev 1196
Make date/timezone validation in changelog.add more robust. Add test.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:08:39 -0700] rev 1195
Validate user input of dates when adding a changelog entry.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 12:13:56 -0700] rev 1194
Add doc string for debugrename.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 09:35:42 -0700] rev 1193
Fortify the recognition of a diff header.
TK Soh <teekaysoh@yahoo.com> [Thu, 01 Sep 2005 09:11:25 -0700] rev 1192
Add -p to incoming and outgoing commands to show patch
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 09:08:21 -0700] rev 1191
Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e.
I inadvertantly used "hg import" on a message I saved, expecting it to do
the right thing, but instead it made the commit look like I authored it,
and filled the description with the email header.
Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard
against "hg import" doing this again.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 09:04:18 -0700] rev 1190
Make import command reject patches that resemble email messages.
See changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e for an example
of why this is a good idea.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 01 Sep 2005 08:01:10 -0700] rev 1189
Make removal check more complete and informative.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 01 Sep 2005 07:48:14 -0700] rev 1188
Fix up remove command to use walk code.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 07:47:26 -0700] rev 1187
From mercurial-bounces@selenic.com Thu Sep 1 07:01:32 2005
Return-Path: <mercurial-bounces@selenic.com>
X-Original-To: bos@serpentine.com
Delivered-To: bos@serpentine.com
Received: from waste.org (waste.org [216.27.176.166]) by
demesne.serpentine.com (Postfix) with ESMTP id 3616A20B571 for
<bos@serpentine.com>; Thu, 1 Sep 2005 07:01:32 -0700 (PDT)
Received: from waste.org (localhost [127.0.0.1]) by waste.org
(8.13.4/8.13.4/Debian-3) with ESMTP id j81DxodQ028829; Thu, 1 Sep 2005
08:59:51 -0500
Received: from web32904.mail.mud.yahoo.com (web32904.mail.mud.yahoo.com
[68.142.206.51]) by waste.org (8.13.4/8.13.4/Debian-3) with SMTP id
j81DxnNA028824 for <mercurial@selenic.com>; Thu, 1 Sep 2005 08:59:49 -0500
Received: (qmail 25859 invoked by uid 60001); 1 Sep 2005 13:59:17 -0000
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com;
h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding;
b=O6sELrlCknW3M/gKVqijWs82e/CbDEum1sEitcuLKXaP9dHU175PszOqMgcSKykMY+BVXtcH3NeaXLM3FyBmqNkoPAvesezyFbgQsHSM1S028oOexybCKMvtGQJmz66hzd1fDb0QoPj1gCcGU2VDevQaOesSmo1xF9jJwy2LlLE=
;
Message-ID: <20050901135917.25856.qmail@web32904.mail.mud.yahoo.com>
Received: from [60.48.222.94] by web32904.mail.mud.yahoo.com via HTTP; Thu,
01 Sep 2005 06:59:17 PDT
Date: Thu, 1 Sep 2005 06:59:17 -0700 (PDT)
From: TK Soh <teekaysoh@yahoo.com>
To: mercurial@selenic.com
In-Reply-To: <20050828075808.GO27787@waste.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
X-Virus-Scanned: by amavisd-new
Subject: Re: add -p to hg tip
X-BeenThere: mercurial@selenic.com
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: mercurial.selenic.com
List-Unsubscribe: <http://selenic.com/mailman/listinfo/mercurial>,
<mailto:mercurial-request@selenic.com?subject=unsubscribe>
List-Archive: <http://www.selenic.com/pipermail/mercurial>
List-Post: <mailto:mercurial@selenic.com>
List-Help: <mailto:mercurial-request@selenic.com?subject=help>
List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial>,
<mailto:mercurial-request@selenic.com?subject=subscribe>
Sender: mercurial-bounces@selenic.com
Errors-To: mercurial-bounces@selenic.com
X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on
demesne.serpentine.com
X-Spam-Level:
X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
version=3.0.4
X-Evolution-Source: imap://bos@www.serpentine.com/
Content-Transfer-Encoding: 8bit
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 07:43:53 -0700] rev 1186
Merge with myself.
Edouard Gomez <ed.gomez@free.fr> [Thu, 01 Sep 2005 07:41:32 -0700] rev 1185
Output Content-encoding for tar.gz and tar.bz2 snapshots
If the HTTP header 'Content-encoding' is missing for tar.gz
snapshots, some gzip capable proxies can bork the tarball and
serve unusable files to users.
GZ tarballs are served using Content-encoding: gzip.
BZ2 tarballs are served using Content-encoding: x-bzip2.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 07:37:49 -0700] rev 1184
Fix up failing tests.
mason@suse.com [Thu, 01 Sep 2005 07:34:53 -0700] rev 1183
Optimize dirstate walking
This generally cuts the time for hg status/diff in half, from 2s down to 1s.
The main parts I'm trying to optimize are:
1) os.walk stats every file. dirstate.changes then stats every file again.
2) os.walk yields every file and subdir to dirstate.traverse who yields every
file and everything in the dirstate map. dirstate.walk then
filters this mass and yields every file to the caller. There should be
fewer steps in here, and fewer duplicate strings yielded.
3) dirstate.walk runs util.unique on the results from dirstate.traverse,
even though it is also passing things through dirstate.seen to look for
duplicates.
I've turned os.walk into something hg specific that takes all the dirstate
ignore and matching rules into account. The new function also takes an
function arg (statmatch()) the caller supplies to help filter out
files it doesn't care about. dirstate.changes uses this to update state
for each file, avoiding the second stat call.
dirstate.walk is changed to turn the match function it is passed into
a statmatch function. The only real difference is that a statmatch
function takes the stat data as a second parameter. It now calls
dirstate.walkhelper, who requires a statmatch function to be passed.
This fails test-walk, but right now I think this is from a sorting error
fixed by this patch.
Index: crew/mercurial/dirstate.py
===================================================================
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 21:07:36 +0200] rev 1182
Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 21:58:44 +0200] rev 1181
Make sure the repository names don't have slashes at the at or else in some
cases env[path_info] will not find an defined repository.
REQUEST_URI can contain a query_string appending the repository name would
lead to corrupt urls.
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 18:23:39 +0200] rev 1180
Saving sys.argv and sys.stderr is not needed anymore
jdc@uwo.ca [Wed, 31 Aug 2005 11:58:15 -0700] rev 1179
Fix mercurial.el help.
jdc@uwo.ca [Wed, 31 Aug 2005 11:56:58 -0700] rev 1178
Adjust hg-strip and hg-chomp regexps.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 31 Aug 2005 11:19:20 -0700] rev 1177
hg serve: print a more useful error message if server can't start.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 31 Aug 2005 10:54:46 -0700] rev 1176
Merge with TAH.