levon@movementarian.org [Mon, 24 Oct 2005 14:52:49 -0700] rev 1423
Use $(MAKE) not make
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Mon, 24 Oct 2005 14:52:41 -0700] rev 1422
py2exe is not able to handle win32com.shell
Changes:
- setup.py: help py2exe finding the shell module in win32com.shell
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Mon, 24 Oct 2005 14:52:30 -0700] rev 1421
Option -i broken in py2exe_for_demandload
Using the includes option -i on modified py2exe is
not working.
Change:
- setup.py: convert self.includes to a list.
olivier.maquelin@intel.com [Mon, 24 Oct 2005 14:34:48 -0700] rev 1420
Avoid insertion/deletion of CRs on stdio during hg serve
Matt Mackall <mpm@selenic.com> [Fri, 21 Oct 2005 00:15:55 -0700] rev 1419
hgweb: fix broken tags->changelog link
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Oct 2005 11:41:14 -0700] rev 1418
Make hgweb work when the repository is empty (no 00changelog.i)
Matt Mackall <mpm@selenic.com> [Thu, 20 Oct 2005 00:26:24 -0700] rev 1417
hgweb: add a mercurial link to the footer
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 19 Oct 2005 20:54:46 -0700] rev 1416
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 19 Oct 2005 00:10:52 -0700] rev 1415
refactor some unlink/remove code and make sure we prune empty dir
Steve Borho <steve@borho.org> [Wed, 19 Oct 2005 00:05:08 -0700] rev 1414
New vim script; provides key mappings and menus for GVIM
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 19 Oct 2005 00:02:41 -0700] rev 1413
Do not use 'glob' expansion by default on OS != 'nt'
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:58:00 -0700] rev 1412
hgweb: fix too short manifest link
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:50:55 -0700] rev 1411
hgweb: make viewing of non-text work in hgweb
We use mimetypes.guess_type to guess file types and util.binary to determine
whether a file is displayable as text.
This lets us display displayable text files in our normal source view.
Files that appear to be binary will be displayed as something like
"(binary:image/gif)".
Clicking on raw view will send the raw file with an appropriate MIME
type. Thus things like GIFs will now be viewable inside hgweb without
making a mess. Further, things like postscript files that are text
should show source in the normal view and a browser can launch a
postscript viewer for the raw view.
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:08:35 -0700] rev 1410
hgweb: shorten all the URLs in the standard templates
A URL like this:
http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f
is now presented as:
http://www.selenic.com/hg/?cs=5010207c352
(though the old style still works, of course)
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:05:30 -0700] rev 1409
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matthew Elder <sseses@gmail.com> [Tue, 18 Oct 2005 21:32:51 -0700] rev 1408
symlink unit test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 21:11:24 -0700] rev 1407
allow empty values for url so we can have /?tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 20:06:34 -0700] rev 1406
hgweb: allow urls to be shorter by using shortcuts
for example cs=xxx will be expanded to cmd=changeset;node=xxx
TK Soh <teekaysoh@yahoo.com> [Tue, 18 Oct 2005 20:06:13 -0700] rev 1405
log: speedup keyword search when used with --branch
By avoiding unnecessary branch lookup.
TK Soh <teekaysoh@yahoo.com> [Tue, 18 Oct 2005 20:06:05 -0700] rev 1404
log: make keyword search truly case-insensitive
Eric Hopper <hopper@omnifarious.org> [Tue, 18 Oct 2005 20:05:54 -0700] rev 1403
lazyindex fix, make load handle negative indexes properly.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 18:38:39 -0700] rev 1402
i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org [Tue, 18 Oct 2005 18:38:04 -0700] rev 1401
use a dummy function for gettext
import gettext is really slow, until we figure out a solution
we use identity for gettext
Benoit Boissinot <benoit.boissinot@ens-lyon.org [Tue, 18 Oct 2005 18:37:48 -0700] rev 1400
i18n first part: make '_' available for files who need it
Zbynek Winkler <zwin@users.sourceforge.net> [Tue, 18 Oct 2005 17:57:27 -0700] rev 1399
Try to use ini-file in the same directory as the exe as the default on NT.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 18 Oct 2005 17:56:50 -0700] rev 1398
make update quieter when nothing is wrong
sometimes when i am going around in my history, i get long lists of
errors from the update command. this patch will fix that. i tried to
make the code style the same like the rest of the code.
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 12:11:23 -0700] rev 1397
bdiff: change spurious __inline to inline
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 00:45:27 -0700] rev 1396
check if a file is ignored before complaining if it is an unsupported type
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 00:43:33 -0700] rev 1395
Add debugsetparents command
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 00:43:19 -0700] rev 1394
dirstate: make sure we read the dirstate before setting parents
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2005 15:49:05 -0700] rev 1393
Fix traceback on bad revlog.lookup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 15 Oct 2005 15:43:40 -0700] rev 1392
add a check for filetype when walking
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2005 15:04:45 -0700] rev 1391
Fix patch failure reporting exception
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2005 15:04:22 -0700] rev 1390
Borrow patch header detection heuristic from quilt
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 19:27:35 -0700] rev 1389
convert-repo: fix up octopus merge conversion
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 19:26:41 -0700] rev 1388
convert-repo: change duplicate elimination
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 19:25:45 -0700] rev 1387
convert-repo: linearize the tag commit
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 17:11:06 -0700] rev 1386
convert-repo: retrieve the commit hash from the tag object for tag import
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 17:09:51 -0700] rev 1385
convert-repo: Fix timezone handling
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 10:59:42 -0700] rev 1384
hg verify: add some bin to hex conversions
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 10:51:02 -0700] rev 1383
hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 10:37:51 -0700] rev 1382
hg verify: more consistency checking between changesets and manifests
TK Soh <teekaysoh@yahoo.com> [Tue, 04 Oct 2005 17:34:02 -0700] rev 1381
log --debug: fix misplaced manifest field
Index: hg/mercurial/commands.py
===================================================================
--- hg.orig/mercurial/commands.py 2005-10-04 16:44:26.000000000 -0700
+++ hg/mercurial/commands.py 2005-10-04 17:16:42.000000000 -0700
@@ -1238,6 +1238,9 @@ def log(ui, repo, *pats, **opts):
self.write(*args)
def write(self, *args):
self.hunk[self.rev].append(args)
+ def debug(self, *args):
+ if self.debugflag:
+ self.write(*args)
def __getattr__(self, key):
return getattr(self.ui, key)
cwd = repo.getcwd()
Eric Hopper <hopper@omnifarious.org> [Tue, 04 Oct 2005 12:24:59 -0700] rev 1380
Fix an hg copy/move bug. Failed if file being copied or moved not in tip.
Matt Mackall <mpm@selenic.com> [Tue, 04 Oct 2005 11:25:48 -0700] rev 1379
Clean up mdiff imports
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 04 Oct 2005 11:21:48 -0700] rev 1378
make diff dates be epoch for add/remove
Eric Hopper <hopper@omnifarious.org> [Mon, 03 Oct 2005 16:07:54 -0700] rev 1377
Fixed a bug in my changes to httprepo.py
Eric Hopper <hopper@omnifarious.org> [Mon, 03 Oct 2005 15:06:46 -0700] rev 1376
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 03 Oct 2005 14:45:14 -0700] rev 1375
Fix traceback when nothing was added during unbundle
The changegroup and commit hook are now run only when
something is modified.
The correct number of changesets added is printed.
Eric Hopper <hopper@omnifarious.org> [Mon, 03 Oct 2005 14:43:11 -0700] rev 1374
Fix hg unbundle chunking performance bug
Matt Mackall <mpm@selenic.com> [Mon, 03 Oct 2005 13:45:59 -0700] rev 1373
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com> [Mon, 03 Oct 2005 12:52:45 -0700] rev 1372
Merge with TAH
Robin Farine <robin.farine@terminus.org> [Wed, 28 Sep 2005 19:42:03 +0200] rev 1371
emacs minor mode optional argument
With GNU Emacs 21.4.1 and desktop save/restore enabled, loading
"mercurial.el" from ".emacs" breaks Emacs' initialization sequence
when the desktop restore code loads a file under Mercurial control.
The function 'desktop-create-buffer' passes an argument to each
minor mode it activates for the buffer.
Matt Mackall <mpm@selenic.com> [Sat, 01 Oct 2005 13:11:48 -0700] rev 1370
hgweb: remove various manifest and file hashes from display
Matt Mackall <mpm@selenic.com> [Sat, 01 Oct 2005 12:50:56 -0700] rev 1369
Allows abbreviated hashes in hgweb
Steve Borho <steve@borho.org> [Sat, 01 Oct 2005 00:02:01 -0700] rev 1368
Fix completion function for 'hg pull'. Fix truncation bug and remove tabs.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Sep 2005 11:08:13 -0700] rev 1367
bisect extension for mercurial
it works almost the same as git-bisect:
hg bisect init # start bisecting
hg bisect bad # mark current revision as broken
hg bisect good [<rev>] # mark <rev> as working
... the bisect code finds a new revision to try
... see if it works
hg bisect good # if it worked
hg bisect bad # it doesn't work
continue until there is only one revision left
Eric Hopper <hopper@omnifarious.org> [Fri, 30 Sep 2005 11:06:19 -0700] rev 1366
Fixed an exception that was caught and improperly forgotten.
Mikael Berthe <mikael@lilotux.net> [Fri, 30 Sep 2005 11:06:13 -0700] rev 1365
Suppress warning in zsh_completion script
Matt Mackall <mpm@selenic.com> [Thu, 29 Sep 2005 15:18:32 -0700] rev 1364
Fix data reported for the nullid changeset
Matt Mackall <mpm@selenic.com> [Thu, 29 Sep 2005 13:20:03 -0700] rev 1363
Merge with self
Steve Borho <steve@borho.org> [Thu, 29 Sep 2005 13:18:39 -0700] rev 1362
zsh completion function for hg
TK Soh <teekaysoh@yahoo.com> [Thu, 29 Sep 2005 13:18:32 -0700] rev 1361
contrib/hgk: remove hardcoded path to Wish
Matt Mackall <mpm@selenic.com> [Thu, 29 Sep 2005 12:49:01 -0700] rev 1360
Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 18:30:54 -0700] rev 1359
Set the user agent for httprepo communication
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 15:23:34 -0700] rev 1358
Partially revert ssh change so we read all of remote ssh stream
zbynek@alex.kolej.mff.cuni.cz [Tue, 27 Sep 2005 15:01:49 -0700] rev 1357
Replacing select.select() with os.fstat() which works also on windows.
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 14:59:30 -0700] rev 1356
Fix +x permissions lost by export/import
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Sep 2005 14:59:02 -0700] rev 1355
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Sep 2005 14:58:48 -0700] rev 1354
Made the abort message for IOError nicer when the filename is known.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Sep 2005 14:58:28 -0700] rev 1353
Fix misleading abort message when permissions are bad.
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 14:53:11 -0700] rev 1352
Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com> [Mon, 26 Sep 2005 16:52:47 -0700] rev 1351
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com> [Mon, 26 Sep 2005 14:01:18 -0700] rev 1350
Fix pipe error regression
Matt Mackall <mpm@selenic.com> [Mon, 26 Sep 2005 14:01:05 -0700] rev 1349
More info on file merge for update --debug
mpm@selenic.com [Sat, 24 Sep 2005 11:33:20 -0700] rev 1348
hgwebdir: Fix date display
mpm@selenic.com [Fri, 23 Sep 2005 19:46:43 -0700] rev 1347
Fix up static-http test
mpm@selenic.com [Fri, 23 Sep 2005 19:46:12 -0700] rev 1346
Execute hooks in the repository root
mpm@selenic.com [Fri, 23 Sep 2005 19:41:45 -0700] rev 1345
hgk: Allow specifying hgk path in [hgk]path
mpm@selenic.com [Fri, 23 Sep 2005 19:38:21 -0700] rev 1344
Fix hgk for date handling changes
mpm@selenic.com [Fri, 23 Sep 2005 19:35:23 -0700] rev 1343
Add support for /etc/mercurial/hgrc.d/*.rc
mpm@selenic.com [Fri, 23 Sep 2005 19:04:19 -0700] rev 1342
Warn on failure to import an extension
Vincent Danjean [Fri, 23 Sep 2005 18:59:16 -0700] rev 1341
Fix copyright symbol in docs
--- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700
+++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700
@@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc
COPYING
-------
-Copyright (C) 2005 Matt Mackall.
+Copyright \(C) 2005 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).
Index: hg/doc/hgmerge.1.txt
===================================================================
--- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700
+++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700
@@ -30,6 +30,6 @@ hg(1) - the command line interface to Me
COPYING
-------
-Copyright (C) 2005 Matt Mackall.
+Copyright \(C) 2005 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).
Vincent Danjean [Fri, 23 Sep 2005 18:58:57 -0700] rev 1340
hgk is a wish script
--- mercurial-0.7.orig/contrib/hgk 2005-09-23 11:02:21.000000000 +0200
+++ mercurial-0.7/contrib/hgk 2005-09-23 11:07:57.000000000 +0200
@@ -1,6 +1,4 @@
-#!/bin/sh
-# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "${1+$@}"
+#!/usr/bin/wish
# Copyright (C) 2005 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified
Vincent Danjean [Fri, 23 Sep 2005 18:58:48 -0700] rev 1339
bash_completion is not an executable
Index: hg/contrib/bash_completion
===================================================================
--- hg.orig/contrib/bash_completion 2005-09-22 09:40:47.000000000 -0700
+++ hg/contrib/bash_completion 2005-09-23 18:32:46.000000000 -0700
@@ -1,5 +1,3 @@
-#!/bin/bash
-
shopt -s extglob
_hg_commands()
mpm@selenic.com [Fri, 23 Sep 2005 17:52:15 -0700] rev 1338
Add empty repo test
mpm@selenic.com [Fri, 23 Sep 2005 17:50:03 -0700] rev 1337
Fix up some bugs for log and grep with empty repo
TK Soh <teekaysoh@yahoo.com> [Fri, 23 Sep 2005 17:19:35 -0700] rev 1336
hgweb file: fixed left-justified line numbers on IE v6.0
IE (v6.0) seemed to squash the spaces surrounding the line
numbers, making them appeared as left- instead of being
right-justified.
Testing with IE v6.0 and Firefox 1.0.6.
Florian La Roche <laroche@redhat.com> [Fri, 23 Sep 2005 17:15:36 -0700] rev 1335
git -> hg conversion script
contrib/convert-repo changes:
- do not print verbose output so that error messages are seen more easily
- Output the date as integer and not as floating point number.
- Do not require a ".git" subdirectory to work on, but use the GIT_DIR
environment var to specify the git repository.
Change is otherwise compatible to the current version and I have tested it
by converting the kernel and several git respositories from kernel.org.
(Btw, the udev test dir contains a /sys dir with entries which should not
be normal dirs and not be normal files. ;-)
Thanks again for mercurial,
Florian La Roche
--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -28,26 +28,18 @@
self.path = path
def getheads(self):
- h = file(self.path + "/.git/HEAD").read()[:-1]
- return [h]
+ return [file(self.path + "/HEAD").read()[:-1]]
def catfile(self, rev, type):
if rev == "0" * 40: raise IOError()
- path = os.getcwd()
- os.chdir(self.path)
- fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev))
- os.chdir(path)
+ fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev))
return fh.read()
def getfile(self, name, rev):
return self.catfile(rev, "blob")
def getchanges(self, version):
- path = os.getcwd()
- os.chdir(self.path)
- fh = os.popen("git-diff-tree --root -m -r %s" % (version))
- os.chdir(path)
-
+ fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version))
changes = []
for l in fh:
if "\t" not in l: continue
@@ -83,9 +75,9 @@
def gettags(self):
tags = {}
- for f in os.listdir(self.path + "/.git/refs/tags"):
+ for f in os.listdir(self.path + "/refs/tags"):
try:
- h = file(self.path + "/.git/refs/tags/" + f).read().strip()
+ h = file(self.path + "/refs/tags/" + f).read().strip()
tags[f] = h
except:
pass
@@ -99,8 +91,7 @@
def getheads(self):
h = self.repo.changelog.heads()
- h = [ hg.hex(x) for x in h ]
- return h
+ return [ hg.hex(x) for x in h ]
def putfile(self, f, e, data):
self.repo.wfile(f, "w").write(data)
@@ -155,12 +146,12 @@
newlines.sort()
if newlines != oldlines:
- print "updating tags"
+ #print "updating tags"
f = self.repo.wfile(".hgtags", "w")
f.write("".join(newlines))
f.close()
if not oldlines: self.repo.add([".hgtags"])
- date = "%s 0" % time.mktime(time.gmtime())
+ date = "%s 0" % int(time.mktime(time.gmtime()))
self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
date, self.repo.changelog.tip(), hg.nullid)
@@ -262,7 +253,7 @@
num -= 1
if c in self.map: continue
desc = self.commitcache[c][3].splitlines()[0]
- print num, desc
+ #print num, desc
self.copy(c)
tags = self.source.gettags()
@@ -275,6 +266,8 @@
self.dest.puttags(ctags)
gitpath, hgpath, mapfile = sys.argv[1:]
+if os.path.isdir(gitpath + "/.git"):
+ gitpath += "/.git"
c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile)
c.convert()
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
TK Soh <teekaysoh@yahoo.com> [Fri, 23 Sep 2005 17:15:10 -0700] rev 1334
hgweb: fixed IE display problem on changelog page
IE (v6.0) didn't seemed to comply to the 15% width on the
left column of changelog display.
Tested with IE v6.0 and Firefox 1.0.6.
mpm@selenic.com [Fri, 23 Sep 2005 17:08:45 -0700] rev 1333
hgweb: fix date bug in hgweb diff generation
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:32:19 -0700] rev 1332
Help debugability: print ssh command being used when --verbose.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:31:00 -0700] rev 1331
Write hgrc file in text mode, even on Windows.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:30:41 -0700] rev 1330
Give ssh a better chance of working on Windows.
Switch the type of quotes used for the remote command.
Open the pipe in binary mode.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:28:55 -0700] rev 1329
Allow files to be opened in text mode, even on Windows.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 07:41:25 -0700] rev 1328
Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 07:36:30 -0700] rev 1327
Some repos represent a date as a float.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 00:06:49 -0700] rev 1326
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 00:05:16 -0700] rev 1325
Move urllib error handling from revlog into statichttprepo, where it belongs.
mpm@selenic.com [Thu, 22 Sep 2005 23:38:04 -0700] rev 1324
hgweb: pass date tuples around rather than whole changesets for dates
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:33:26 -0700] rev 1323
Fix old-http test when no server exists.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:31:44 -0700] rev 1322
Make revlog constructor more discerning in its treatment of errors.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:19:47 -0700] rev 1321
Clean up date and timezone handling.
We used to pass changelog dates around as a "unixtime timezone" string
containing a pair of encoded ints. Now, they get passed around as a
(unixtime, timezone) tuple of numbers, which makes much more sense.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 22:46:50 -0700] rev 1320
Fix up representation of dates in hgweb.
Date display is now uniform both on the command line and via the web
interface.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 21:42:33 -0700] rev 1319
Fix behaviour of commit.
It's now a fatal error if the option to --logfile isn't readable.
Ditto if both --message and --logfile are specified.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 21:29:02 -0700] rev 1318
Unify display of dates.
We now use one function, commands.datestr, to display dates, instead
of calling time.asctime in inconsistent ways.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 21:15:57 -0700] rev 1317
Print commit time/date from perspective of committer.
Previously, it was printed in the time zone of the reader, but with
the committer's time zone offset. It is now consistent.
mpm@selenic.com [Thu, 22 Sep 2005 10:12:42 -0700] rev 1316
Hook fixups
Pass the first new changeset node to the changegroup hook
Call commit for each changeset in a pull changegroup
Improve hook docs
Lee Cantey <lcantey@gmail.com> [Thu, 22 Sep 2005 09:47:27 -0700] rev 1315
Fix setting of hg default when using --pull on clone of local repository.
mpm@selenic.com [Thu, 22 Sep 2005 09:47:03 -0700] rev 1314
Fix default clone destination
The default clone wasn't working:
$ hg clone hg
abort: repository hg/.hg not found!
This was because we were creating the destination directory from the
default, then checking whether it existed to determine whether to
expand the path.
Anupam Kapoor<anupam.kapoor@gmail.com> [Thu, 22 Sep 2005 09:42:15 -0700] rev 1313
Fix traceback during invalid rev identifier for debugdata
mpm@selenic.com [Thu, 22 Sep 2005 09:41:34 -0700] rev 1312
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Wed, 21 Sep 2005 09:02:41 +0200] rev 1311
bash_completion: extended patterns require extglob option
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 21 Sep 2005 08:25:46 +0200] rev 1310
Updated CONTRIBUTORS.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 21 Sep 2005 08:07:38 +0200] rev 1309
Make debugwalk strip trailing spaces and remove these from test-walk.out
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 21 Sep 2005 07:56:19 +0200] rev 1308
Cleanup of tabs and trailing spaces.
mpm@selenic.com [Thu, 22 Sep 2005 09:39:05 -0700] rev 1307
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:50:43 -0700] rev 1306
Add release notes to built Windows package.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:44:50 -0700] rev 1305
Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:44:35 -0700] rev 1304
Update hgrc documentation to refer to Windows paths.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:27:00 -0700] rev 1303
Fix path of win32text extension in INI file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:26:50 -0700] rev 1302
Update Inno Setup installer to install INI file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:18:24 -0700] rev 1301
Fix small thinko.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:17:24 -0700] rev 1300
Rename mercurial.ext to hgext.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:46:01 -0700] rev 1299
Package the extension directory.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:40:52 -0700] rev 1298
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:23:25 -0700] rev 1297
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:23:07 -0700] rev 1296
Add placeholder extension module.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:22:16 -0700] rev 1295
Make contract with extensions optional.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 13:33:24 -0700] rev 1294
Clean up whitespace damage.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 11:44:08 -0700] rev 1293
Enhance the file filtering capabilities.
We now allow filtering through either pipes or pairs of temporary
files. The latter appear to be mandatory for use on Windows.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 09:56:30 -0700] rev 1292
Use platform-appropriate rc file names.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:47:57 -0700] rev 1291
Document Windows installer build process.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:47:40 -0700] rev 1290
Add Windows installer file.
This uses Inno Setup. If you don't use ISTool to edit the file, you
are either brave, nuts, or both.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:27:52 -0700] rev 1289
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:20:20 -0700] rev 1288
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:02:53 -0700] rev 1287
Add win32 README for standalone installer.
mpm@selenic.com [Thu, 22 Sep 2005 09:22:25 -0700] rev 1286
Make incoming/outgoing show oldest first
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Tue, 20 Sep 2005 21:35:51 -0700] rev 1285
Make 'hg import' platform independent.
- moved popen("patch ...") from commands.py to util.py
- files may not be single quoted in popen under windows: fixed
- patch returns the files quoted under windows. quotes need to
be stripped off: fixed
Bryan O'Sullivan <bos@serpentine.com> [Tue, 20 Sep 2005 21:29:07 -0700] rev 1284
Fix Volker's modifications to setup.py for non-Windows systems.
Volker.Kleinfeld@gmx.de [Tue, 20 Sep 2005 19:25:14 -0700] rev 1283
Support for the distutils extention 'py2exe' added.
Description:
- If the py2exe distutils extention is installed this patch allows
building standalone exe for windows - example:
> python setup.py build --compiler=mingw32 py2exe
- The 'out of the box' py2exe is not able to resolve
the dependencies due to 'demandload'. A new helper module
of scanning the mercurial package has been added.
Changed:
- setup.py: importing py2exe and sub classing its command class
to fetch the build directory and insert the needed includes
- packagescan.py: new helper module added, that scans the distutil
build directory for modules to be included.
mpm@selenic.com [Tue, 20 Sep 2005 11:38:01 -0700] rev 1282
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Tue, 20 Sep 2005 11:20:48 -0700] rev 1281
Add --pull option to clone.
mpm@selenic.com [Tue, 20 Sep 2005 10:45:26 -0700] rev 1280
pull/unbundle: raise an exception on premature EOF
eric@localhost.localdomain [Mon, 19 Sep 2005 18:24:37 -0700] rev 1279
Add checks for programs which are required for the test suite to run.
All prerequisite programs are checked for existance, and if any are
missing,
a list of missing programs is printed, and the test suite is aborted.
All programs currently used in the tests, except those in core-utils,
are checked.
mpm@selenic.com [Mon, 19 Sep 2005 15:59:17 -0700] rev 1278
hgit -> hgk.py
Move hgit to hgk.py
- importing hgit as an extension created compiled hgitc, which was confusing
- hgit existed to support hgk so it was slightly misnamed
- removed executable bit as we no longer run it directly
- add 'view' command so we can run hg view
- change git-* commands to debug-* so hg help won't show them
- chdir to repository root on view so hgk doesn't choke in subdirs
Ollivier Robert <roberto@keltia.freenix.fr> [Mon, 19 Sep 2005 22:15:36 +0200] rev 1277
Add a favicon.ico, small version of the main HG image.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 18 Sep 2005 15:03:07 -0700] rev 1276
Fix dirstate.changes for ignored directories.
Do a second walking pass to examine any leftover files in the dirstate
map that are in the .hgignore file but match our search criteria.
This fixes the case of entire directories never being examined due to
their presence in the .hgignore file, and should hopefully not add any
significant overhead.
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:07:02 -0700] rev 1275
Fix cut and paste error in hgweb.py
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:06:36 -0700] rev 1274
Fix man page typos
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:05:54 -0700] rev 1273
Clean up RPM spec file
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:05:04 -0700] rev 1272
Update version number in PKG-INFO
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:37:14 -0700] rev 1271
Fix ignore regression.
An empty or non-existent hgignore file must return False (don't
ignore) for everything.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:27:27 -0700] rev 1270
Switch to new syntax for .hgignore files.
Here is the new syntax, in summary.
Trailing white space is dropped.
The escape character is "\".
Comments start with #.
Empty lines are skipped.
Lines can be of the following formats:
syntax: regexp # defaults following lines to non-rooted regexps
syntax: glob # defaults following lines to non-rooted globs
re:pattern # non-rooted regular expression
glob:pattern # non-rooted glob
pattern # pattern of the current default type
The default pattern type is regexp, which is completely backwards
compatible with the old hgignore syntax.
In the dirstate class, the ignore method has been reworked to be based
on the util.matcher function, by way of a new dirstate.hgignore
method.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:23:58 -0700] rev 1269
Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:23:19 -0700] rev 1268
Fix performance of dirstate.changes with ignored directories.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 16 Sep 2005 14:50:06 -0700] rev 1267
Fix diff command so it doesn't walk the dirstate unnecessarily.
mpm@selenic.com [Fri, 16 Sep 2005 14:01:03 -0700] rev 1266
Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3
Bryan O'Sullivan <bos@serpentine.com> [Fri, 16 Sep 2005 13:34:29 -0700] rev 1265
Update doc for ssh URL, describing path handling more clearly.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 16 Sep 2005 21:34:18 +0200] rev 1264
Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 16 Sep 2005 21:31:31 +0200] rev 1263
Added new debug commands to bash_completion.
mpm@selenic.com [Fri, 16 Sep 2005 10:42:20 -0700] rev 1262
Add debugancestor command
mpm@selenic.com [Thu, 15 Sep 2005 14:06:58 -0500] rev 1261
test-hup: hgrc no longer created at init
mpm@selenic.com [Thu, 15 Sep 2005 14:05:48 -0500] rev 1260
hgweb: use ui:username rather than web:contact
This also removes the creation of .hg/hgrc with web:contact at init time.
mpm@selenic.com [Thu, 15 Sep 2005 03:00:10 -0500] rev 1259
Merge with BOS
mpm@selenic.com [Thu, 15 Sep 2005 02:59:16 -0500] rev 1258
Add file encoding/decoding support
Bryan O'Sullivan <bos@serpentine.com> [Thu, 15 Sep 2005 00:04:29 -0700] rev 1257
Clamp negative rev numbers at zero.
Prior to this change, trying to run "hg log -r -50:" in a repo with
less than 50 changes caused an error. Now that we clamp at zero: no
more error.
mpm@selenic.com [Thu, 15 Sep 2005 00:49:40 -0500] rev 1256
mark copy/rename as experimental in the docs
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 22:32:12 -0700] rev 1255
Get all commands that operate on files to honour --verbose and --quiet.
Fix minor bug in remove command; the when-to-unlink logic was wonky.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 21:57:41 -0700] rev 1254
Switch cat command to use walk code.
The old syntax of "hg cat FILE REV" is now obsolete.
Use "hg cat -r REV FILE" instead, as for all other commands.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 16:34:22 -0700] rev 1253
Add rename/mv command.
This is the logical equivalent of copy and remove, and is in fact
implemented as such. It doesn't use the remove command directly.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 16:31:03 -0700] rev 1252
The copy tests don't need to invoke cp any longer.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 15:41:22 -0700] rev 1251
Fix lots of exception-related problems.
These have been around since the Big Code Split.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 14:39:46 -0700] rev 1250
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 14:29:02 -0700] rev 1249
Fix up copy command to behave more like regular "cp".
In addition to recording changes, copy now updates the working
directory.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 11:27:36 -0700] rev 1248
Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 10:50:03 -0700] rev 1247
Make remove command really unlink files.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 09 Sep 2005 22:07:10 -0700] rev 1246
mercurial.el: implement hg-pull, and stub in hg-update.
Chris Mason <mason@suse.com> [Wed, 14 Sep 2005 15:50:31 -0500] rev 1245
Files not getting added appropiately
On Wed, 14 Sep 2005 15:15:13 -0400
Daniel Santa Cruz <byteshack@gmail.com> wrote:
> c:> hg debugstate
> a 666 0 09/14/05 15:11:44 a/aa\aa.a
> a 666 0 09/14/05 15:11:47 a/aa\aa.b <---- notice mixed
> slashes
>
> This all seems very confusing....
Please try this:
mpm@selenic.com [Wed, 14 Sep 2005 15:48:34 -0500] rev 1244
clone: fall back to pull if we can't lock the source repo
root@coffee.suse.com [Wed, 14 Sep 2005 13:14:20 -0500] rev 1243
Fix hgit revtree bug with stop revision handling
Mikael Berthe <mikael@lilotux.net> [Wed, 14 Sep 2005 12:35:10 -0500] rev 1242
Fix hg cat when the file cannot be found in the specified revision
Stephen Darnell [Wed, 14 Sep 2005 12:22:20 -0500] rev 1241
Add support for cloning with hardlinks on windows.
In order to use hardlinks, the win32file module is needed, and this is
present in ActivePython. If it isn't present, or hardlinks are not supported
on the underlying filesystem, a regular copy is used.
When using hardlinks the biggest benefit is probably the saving in space,
but cloning can be much quicker. For example cloning the Xen tree
(non trivial) without an update goes from about 95s to 15s.
Unix-like platforms should be unaffected, although should be more tolerant on
filesystems that don't support hard links.
(tweaked by mpm to deal with new copyfiles function)
--- hg.orig/mercurial/commands.py 2005-09-13 19:32:53.000000000 -0500
+++ hg/mercurial/commands.py 2005-09-14 12:11:34.000000000 -0500
@@ -620,10 +620,6 @@ def clone(ui, source, dest=None, **opts)
if other.dev() != -1:
abspath = os.path.abspath(source)
- copyfile = (os.stat(dest).st_dev == other.dev()
- and getattr(os, 'link', None) or shutil.copy2)
- if copyfile is not shutil.copy2:
- ui.note("cloning by hardlink\n")
# we use a lock here because if we race with commit, we can
# end up with extra data in the cloned revlogs that's not
@@ -638,7 +634,7 @@ def clone(ui, source, dest=None, **opts)
for f in files.split():
src = os.path.join(source, ".hg", f)
dst = os.path.join(dest, ".hg", f)
- util.copyfiles(src, dst, copyfile)
+ util.copyfiles(src, dst)
repo = hg.repository(ui, dest)
Index: hg/mercurial/util.py
===================================================================
--- hg.orig/mercurial/util.py 2005-09-08 00:15:25.000000000 -0500
+++ hg/mercurial/util.py 2005-09-14 12:16:49.000000000 -0500
@@ -12,7 +12,7 @@ platform-specific details from the core.
import os, errno
from demandload import *
-demandload(globals(), "re cStringIO")
+demandload(globals(), "re cStringIO shutil")
def binary(s):
"""return true if a string is binary data using diff's heuristic"""
@@ -217,17 +217,28 @@ def rename(src, dst):
os.unlink(dst)
os.rename(src, dst)
-def copyfiles(src, dst, copyfile):
- """Copy a directory tree, files are copied using 'copyfile'."""
+def copyfiles(src, dst, hardlink=None):
+ """Copy a directory tree using hardlinks if possible"""
+
+ if hardlink is None:
+ hardlink = (os.stat(src).st_dev ==
+ os.stat(os.path.dirname(dst)).st_dev)
if os.path.isdir(src):
os.mkdir(dst)
for name in os.listdir(src):
srcname = os.path.join(src, name)
dstname = os.path.join(dst, name)
- copyfiles(srcname, dstname, copyfile)
+ copyfiles(srcname, dstname, hardlink)
else:
- copyfile(src, dst)
+ if hardlink:
+ try:
+ os_link(src, dst)
+ except:
+ hardlink = False
+ shutil.copy2(src, dst)
+ else:
+ shutil.copy2(src, dst)
def opener(base):
"""
@@ -244,13 +255,13 @@ def opener(base):
if mode[0] != "r":
try:
- s = os.stat(f)
+ nlink = nlinks(f)
except OSError:
d = os.path.dirname(f)
if not os.path.isdir(d):
os.makedirs(d)
else:
- if s.st_nlink > 1:
+ if nlink > 1:
file(f + ".tmp", "wb").write(file(f, "rb").read())
rename(f+".tmp", f)
@@ -266,10 +277,41 @@ def _makelock_file(info, pathname):
def _readlock_file(pathname):
return file(pathname).read()
+def nlinks(pathname):
+ """Return number of hardlinks for the given file."""
+ return os.stat(pathname).st_nlink
+
+if hasattr(os, 'link'):
+ os_link = os.link
+else:
+ def os_link(src, dst):
+ raise OSError(0, "Hardlinks not supported")
+
# Platform specific variants
if os.name == 'nt':
nulldev = 'NUL:'
+ try: # ActivePython can create hard links using win32file module
+ import win32file
+
+ def os_link(src, dst): # NB will only succeed on NTFS
+ win32file.CreateHardLink(dst, src)
+
+ def nlinks(pathname):
+ """Return number of hardlinks for the given file."""
+ try:
+ fh = win32file.CreateFile(pathname,
+ win32file.GENERIC_READ, win32file.FILE_SHARE_READ,
+ None, win32file.OPEN_EXISTING, 0, None)
+ res = win32file.GetFileInformationByHandle(fh)
+ fh.Close()
+ return res[7]
+ except:
+ return os.stat(pathname).st_nlink
+
+ except ImportError:
+ pass
+
def is_exec(f, last):
return last
mason@suse.com [Tue, 13 Sep 2005 19:33:18 -0500] rev 1240
Convert hgk to use the hgit extension, and upate to the latest gitk
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.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 31 Aug 2005 10:54:00 -0700] rev 1175
Emacs: fix invocations of "hg log" to match current behaviour of log.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 09:01:41 +0200] rev 1174
Added missing 'import errno', and use errno for EPIPE, too.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 08:40:55 +0200] rev 1173
Merged changes.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 08:38:34 +0200] rev 1172
Use path relative to document root as reponame if published via a web server.
The full path is still displayed when using 'hg serve'.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 30 Aug 2005 23:16:15 -0700] rev 1171
Sort items in each hgrc section. Add web/description.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 07:25:02 +0200] rev 1170
Make .hg/hgrc optional for repositories published by hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 21:26:27 +0200] rev 1169
Reverted changeset e254bcbfe636e97301f76c7da241b07be14f3d36
Volker Kleinfeld agreed that this is dead code and tried to fix a problem
which was already fixed somewhere else.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:42:58 +0200] rev 1168
Fixed two tests to run with bourne shell.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:32:11 +0200] rev 1167
Added FIXME output to test-grep so the test will not fail.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:17:05 +0200] rev 1166
Added test case for zip/gz/bz2 archive downloads.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:12:17 +0200] rev 1165
Fixed import needed to serve zip files which broke because of other changes.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 18:10:20 +0200] rev 1164
Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 16:36:29 +0200] rev 1163
Don't need to save sys.stdin and sys.stdout anymore
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 16:33:04 +0200] rev 1162
Use local generated env instead of os.environ
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 16:25:46 +0200] rev 1161
Fix hg serve...
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 14:52:58 +0100] rev 1160
Fix TypeError
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 10:57:52 +0200] rev 1159
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing),
people should make sure they write strings.
TK Soh <tksoh@freescale.com> [Tue, 30 Aug 2005 11:22:29 +0200] rev 1158
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com> [Tue, 30 Aug 2005 11:17:20 +0200] rev 1157
tcsh_completion_build.sh: fixed error caused by xargs on Linux
TK Soh <teekaysoh@yahoo.com> [Tue, 30 Aug 2005 11:16:31 +0200] rev 1156
Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com> [Tue, 30 Aug 2005 11:16:31 +0200] rev 1155
Add contrib script for generating tcsh completion source
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 12:15:37 -0700] rev 1154
patchbomb: fix up confusion between strings and lists of strings.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1153
bash_completion: try to use bash3 features if they're available
This does NOT break completion for bash 2.05b (I haven't tested
earlier versions)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1152
bash_completion: small cleanup and bugfix
_hg_count_non_option wasn't taking global options into account
while counting non-option arguments.
It also used only its first argument.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1151
teach bash_completion about --cwd
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1150
bash_completion: better handling of aliases
Instead of listing every alias in the big case..esac, use hg help
to get the canonical name of the command.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1149
bash_completion: update for new help output format
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 11:28:48 -0700] rev 1148
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 10:31:41 -0700] rev 1147
Merge with TAH.
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 10:05:49 -0700] rev 1146
grep: extend functionality, add man page entry, add unit test.
walkchangerevs now returns a two-tuple. Its behaviour is also
extensively commented.
The annotate command's getname function has been factored out to a new
function, trimname, so it can be shared between annotate and grep.
The behaviour of grep has been beefed up, so that it now performs a
number of useful functions.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 29 Aug 2005 08:24:06 -0700] rev 1145
grep: change default to printing first matching rev.
Printing of every matching rev remains via --every-match/-e switch.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:42:46 +0200] rev 1144
Documented passing list or dict instead of config file in hgwebdir.cgi
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:39:01 +0200] rev 1143
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:34:35 +0200] rev 1142
Cleaned up hgweb.hgwebdir.run()
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:28:39 +0200] rev 1141
Use ConfigParser only in hgwebdir.__init__()
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:19:02 +0200] rev 1140
Don't create repo objects in hgwebdir, ui object is enough.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:07:07 +0200] rev 1139
Reverted change 51f26e856f3d: Reading changelogs is too slow.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 19:50:13 +0200] rev 1138
Use commit time instead of stat to check time of last change.
Ollivier Robert <roberto@keltia.freenix.fr> [Sun, 28 Aug 2005 19:18:39 +0200] rev 1137
Remove the link from the template as there no real way to have it always be correct.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:53:43 +0200] rev 1136
Make diffstat optional for patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:52:55 +0200] rev 1135
Variable 'body' was missing in patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:30:40 +0200] rev 1134
Adjusted test-hup for generated .hg/hgrc
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:27:24 +0200] rev 1133
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:13:28 +0200] rev 1132
Completed renaming author to contact in hgwebdir:
Prefer [web] contact = foo instead of author, but still accept the old name.
Adjusted template to show obfuscated contact. Drop bogus <i>email</i> entry.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 17:55:15 +0200] rev 1131
Create repository objects instead of using own ConfigParser in hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 17:53:37 +0200] rev 1130
Longer variable names in hgwebdir: l->repos, v->name, r->path
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 17:29:28 +0200] rev 1129
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 16:41:16 +0200] rev 1128
Fixed test-static-http with http_proxy variable set.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 16:37:24 +0200] rev 1127
Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 16:24:04 +0200] rev 1126
Changed printing of copies in hg debugstate to: "copy: source -> dest"
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:45:27 -0700] rev 1125
Add RSS link to the repository index.
Index: hg/templates/index.tmpl
===================================================================
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:44:26 -0700] rev 1124
Add the template.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:44:15 -0700] rev 1123
Use a template for the error message.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:44:02 -0700] rev 1122
Use .has_option to avoid the unknown Exception.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:43:13 -0700] rev 1121
NoOptionError is unknown there.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:43:08 -0700] rev 1120
Handle a nonexistent repository with a 404 error.
Based on changeset 62ea868cafbfa3acb7e5dba6982ecb46a1637246 from
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
in http://hannibal.lr-s.tudelft.nl/~vincent/fcgi
roberto@keltia.freenix.fr [Sat, 27 Aug 2005 23:42:51 -0700] rev 1119
Protect against unknown repositories.
mpm@selenic.com [Sat, 27 Aug 2005 23:10:49 -0700] rev 1118
patchbomb: eliminate silly complete summary message
No longer makes sense without attachments
mpm@selenic.com [Sat, 27 Aug 2005 22:04:17 -0700] rev 1117
fix some rename/copy bugs
- delete copy information when we update dirstate
hg was keeping the copy state and marking things as copied on
multiple commits
- files that are renamed should have no parents
if you do a rename/copy to an existing file, it should not be marked
as descending from its previous revisions.
- remove spurious print from filelog.renamed
- add some more copy tests
mpm@selenic.com [Sat, 27 Aug 2005 20:58:53 -0700] rev 1116
Add some rename debugging support
mpm@selenic.com [Sat, 27 Aug 2005 20:42:53 -0700] rev 1115
bash_completion: add debugindex and debugdata support
Stephen Darnell [Sat, 27 Aug 2005 19:15:02 -0700] rev 1114
Remove the lock file copied during clone (was the source lock file)
Index: hg/mercurial/commands.py
===================================================================
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 18:55:14 -0700] rev 1113
Updated manpage and help.
Updated manpage on change to hg status; standardized description
of -print0 options.
mpm@selenic.com [Sat, 27 Aug 2005 18:40:25 -0700] rev 1112
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com [Sat, 27 Aug 2005 18:27:45 -0700] rev 1111
Add an old-http test case
This uses a trivial Python http server to test pulling from a static
http server.
mpm@selenic.com [Sat, 27 Aug 2005 18:11:32 -0700] rev 1110
Add a simple dummy ssh test
This uses the -e flag to run a dummy script rather than actual ssh to
test the protocol over a local pipe.
mpm@selenic.com [Sat, 27 Aug 2005 17:26:26 -0700] rev 1109
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:36:25 +0200] rev 1108
Remove some options from 'hg grep':
-Z (we have -0 as in locate)
-a (use "-r 0:tip" instead, or always grep all unless -r is given)
-e (we have the PATTERN argument)
-v (doesn't work, and this is more of a job for 'hg cat|grep')
-s (we have -q/--quiet)
-f (should be always enabled if -l used, or enable on -v/--verbose)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:35:30 +0200] rev 1107
Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:25:55 +0200] rev 1106
Whitespace cleanup.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:23:32 +0200] rev 1105
Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.
mpm@selenic.com [Sat, 27 Aug 2005 16:42:03 -0700] rev 1104
Fix dirstate imports
mpm@selenic.com [Sat, 27 Aug 2005 16:40:24 -0700] rev 1103
Fix sshrepo imports
mpm@selenic.com [Sat, 27 Aug 2005 16:34:54 -0700] rev 1102
localrepo: minor opener usage restructuring
mpm@selenic.com [Sat, 27 Aug 2005 16:28:53 -0700] rev 1101
Separate out old-http support
- create new statichttprepo class
- pull remote bits out of localrepo
- pull remote bits out of util.opener
- switch hg.repository to use statichttprepo
mpm@selenic.com [Sat, 27 Aug 2005 15:35:37 -0700] rev 1100
localrepo: more import/namespace tidying
mpm@selenic.com [Sat, 27 Aug 2005 15:19:36 -0700] rev 1099
Minor import fixups
mpm@selenic.com [Sat, 27 Aug 2005 15:13:52 -0700] rev 1098
manifest: convert sys.stderr bits to AssertionError
mpm@selenic.com [Sat, 27 Aug 2005 15:09:46 -0700] rev 1097
localrepo: adjust some imports, remove sys dependency
mpm@selenic.com [Sat, 27 Aug 2005 15:05:59 -0700] rev 1096
sshrepo: adjust file comment
mpm@selenic.com [Sat, 27 Aug 2005 15:05:43 -0700] rev 1095
changelog: adjust imports, comment
mpm@selenic.com [Sat, 27 Aug 2005 14:59:25 -0700] rev 1094
Adjust some imports
mpm@selenic.com [Sat, 27 Aug 2005 14:56:58 -0700] rev 1093
commands: use revlog directly for debug commands
This eliminates the import in hg.py
mpm@selenic.com [Sat, 27 Aug 2005 14:55:07 -0700] rev 1092
commands: use node functions directly
mpm@selenic.com [Sat, 27 Aug 2005 14:43:20 -0700] rev 1091
Move hash function back to revlog from node
mpm@selenic.com [Sat, 27 Aug 2005 14:31:41 -0700] rev 1090
Move opener to utils
- move the opener code down to util
- add docstring
- change commands.py users to simply use file instead
mpm@selenic.com [Sat, 27 Aug 2005 14:21:25 -0700] rev 1089
Break apart hg.py
- move the various parts of hg.py into their own files
- create node.py to store node manipulation functions
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 12:00:12 -0700] rev 1088
updated manpage for new options of status
mpm@selenic.com [Sat, 27 Aug 2005 01:55:10 -0700] rev 1087
hgweb: add catch for connection reset
suggested by Jeff Sipek
mpm@selenic.com [Sat, 27 Aug 2005 01:50:18 -0700] rev 1086
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 01:49:41 -0700] rev 1085
status: added option -p and -0 to assist xargs
The -p option strips the status prefix of each file, while
-0 ends each file with a NUL character, instead of a newline.
Together, selected group of files can be passed to 'xargs -0'
for further processing.
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 01:49:35 -0700] rev 1084
updated manpage on global options and typo fix.
mpm@selenic.com [Sat, 27 Aug 2005 01:43:48 -0700] rev 1083
Add some docstrings to revlog.py
mpm@selenic.com [Sat, 27 Aug 2005 01:13:28 -0700] rev 1082
Update util.py docstrings, fix walk test
mpm@selenic.com [Fri, 26 Aug 2005 23:29:10 -0700] rev 1081
Change canonpath to not know about repo objects
Code in util should not have any knowledge about repo objects
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 08:22:10 +0200] rev 1080
Updated list of contributors.
mpm@selenic.com [Fri, 26 Aug 2005 20:56:50 -0700] rev 1079
Document archive download options
mpm@selenic.com [Fri, 26 Aug 2005 20:52:31 -0700] rev 1078
Various cleanups for tarball support
s/tarball/archive/
query config rather than maintaining a list
default all archive support to off
use changeset nodes rather than manifest nodes
use web:name for archive name
don't use rev number in filename, it's not portable
refactor manifest lookup bits
use finally: clause to delete tmpfile
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:48 -0700] rev 1077
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:34 -0700] rev 1076
tarball support v0.3
Hello,
I'm slowly improving support for tarballs in Mercurial. Attached patch
is made against current tip in Matt's repository - f859e9cba1b9, and
contains everything done so far.
Changes:
- gzip and bzip2 tarballs are sent immediately without writing to
temporary files (I was wrong Matt, it can be done very easy)
- hgrc customization, you can choose which type (if any) you will support
There's no easy way to support compression levels, since TarFile open()
assume that it is 9. I tried to use gzopen(), and bz2open() methods
instead, but it seems that headers of generated archives, are missing or
wrong. We could eventually try to rewrite tarfile.py and include our own
version into Mercurial, but I don't know if it's good idea...
Wojtek
Volker.Kleinfeld@gmx.de [Fri, 26 Aug 2005 19:20:04 -0700] rev 1075
Fixed system command abord reason on windows.
mason@suse.com [Fri, 26 Aug 2005 19:19:35 -0700] rev 1074
Add revlog.reachable to find a graph of ancestors for a given rev
Bart Trojanowski <bart@jukie.net> [Fri, 26 Aug 2005 19:08:25 -0700] rev 1073
[PATCH] raise exceptions with Exception subclasses
Fixed the patch. Using Exception subclasses.
(tweaked by mpm)
mpm@selenic.com [Fri, 26 Aug 2005 16:49:23 -0700] rev 1072
Fixes for push corner case
TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.
Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.
Add some more debugging output.
mason@suse.com [Fri, 26 Aug 2005 14:05:52 -0700] rev 1071
Add support for extension modules
This adds support for an [extensions] section to hgrc. This has the form of:
[extensions]
mod=[path]
If a path is specified, the python module found at that path is load.
Otherwise, __import__ is used to find the module.
Each module must implement a dict called cmdtable where the command line
options for that module live. Each module must also implement a reposetup
function:
cmdtable = {}
def reposetup(ui, repo): pass
Index: hg/mercurial/ui.py
===================================================================
mpm@selenic.com [Fri, 26 Aug 2005 13:59:14 -0700] rev 1070
hgwebdir index: change "author" to "contact"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 22:40:56 +0200] rev 1069
Allow using a ssh repository without a path.
This uses the home directory on the remote side or the directory
specified in the command in .ssh/authorized_keys
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:47:09 +0200] rev 1068
Fixed synopsis for grep command.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:37:28 +0200] rev 1067
Fixed zero-padded filenames with %r if there is a longer number in the middle.
e.g. with: hg export -o ../%r.patch 99 100 98
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:26:44 +0200] rev 1066
Shortened commands.revrange() a little bit, added docstring.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:19:18 +0200] rev 1065
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:31:40 +0200] rev 1064
Removed obsolete imports from hgwebdir.cgi
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:29:52 +0200] rev 1063
Some more spacing/indentation/linebreak cleanups to hgweb.py.
benoit.boissinot@ens-lyon.fr [Fri, 26 Aug 2005 13:06:58 +0200] rev 1062
pep-0008 cleanup
- Don't use spaces around the '=' sign when used to indicate a
keyword argument or a default parameter value.
mpm@selenic.com [Fri, 26 Aug 2005 02:03:35 -0700] rev 1061
Fix set type usage for Python 2.3
mpm@selenic.com [Fri, 26 Aug 2005 01:56:49 -0700] rev 1060
Merge from BOS, fix help
bos@serpentine.internal.keyresearch.com [Thu, 25 Aug 2005 17:13:48 -0700] rev 1059
grep: speed up matching, and only return one match per line.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 10:11:54 -0700] rev 1058
Use ui.write instead of print in debugwalk.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 02:00:03 -0700] rev 1057
Add grep command.
It currently searches all revs of every matching file. I'll change
this soon so that it can still do this, but it will not be the default
behaviour.
Many options are unimplemented. There's only one output mode. Binary
files are not handled yet.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 22:25:55 -0700] rev 1056
Map long option names containing dashes to ones containing underscores.
mpm@selenic.com [Fri, 26 Aug 2005 01:51:44 -0700] rev 1055
Minor test-help fix
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:39:43 +0200] rev 1054
Fixed some synopsises in command help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:01:55 +0200] rev 1053
Added missing doc strings for two new debug commmands.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:56:33 +0200] rev 1052
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:15:04 +0200] rev 1051
Clean up displaying help of global options, only one row per option.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:47:43 +0200] rev 1050
Moved --cwd handling to a place where ui and exception handling already exists.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:42:56 +0200] rev 1049
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:37:41 +0200] rev 1048
Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:26:21 +0200] rev 1047
Moved special handling of --version and no hg command from parse to dispatch.
This allows e.g. 'hg status --version' to work.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 18:35:35 +0200] rev 1046
Sort global options by topic: directories, ui, timing, other
(and changed indentation to match command table)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Aug 2005 18:25:19 +0200] rev 1045
run the doc/* through aspell.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 16:00:08 +0200] rev 1044
Removed forgotten debug print statement from commands.py and tests.
mpm@selenic.com [Wed, 24 Aug 2005 19:19:35 -0700] rev 1043
Update tests
mpm@selenic.com [Wed, 24 Aug 2005 19:16:45 -0700] rev 1042
Fix a couple fencepost errors in hg log
mpm@selenic.com [Wed, 24 Aug 2005 18:45:49 -0700] rev 1041
Fix hg log -p
mpm@selenic.com [Wed, 24 Aug 2005 18:42:42 -0700] rev 1040
Show number of new heads when doing a pull
mpm@selenic.com [Wed, 24 Aug 2005 18:40:17 -0700] rev 1039
Add debugdata for dumping revlog revision data
bos@eng-25.internal.keyresearch.com [Wed, 24 Aug 2005 14:46:02 -0700] rev 1038
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Wed, 24 Aug 2005 14:45:35 -0700] rev 1037
Fix a small corner of log behaviour.
If invoked with no arguments in a subdirectory of the repo root, it
should print the history of the repository as a whole.
mpm@selenic.com [Wed, 24 Aug 2005 14:24:20 -0700] rev 1036
Update hg log docs
mpm@selenic.com [Wed, 24 Aug 2005 13:31:46 -0700] rev 1035
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 13:26:45 -0700] rev 1034
Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:50:11 -0700] rev 1033
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:43:09 -0700] rev 1032
Get patchbomb working with tip again.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:39:10 -0700] rev 1031
Rewrite log command. New version is faster and more featureful.
The original implementation of log walked backwards through history,
which had terrible behaviour. It took several minutes to view
complete kernel change history on a fast machine, for example.
The rewrite uses a windowed approach to walk hunks of history
forwards, while still giving results in reverse order. This reduces
run time from five minutes to five seconds on my system.
In addition, the rewrite uses our normal name handling mechanisms, so
you can run a command like "hg log net/ipv4/**.c" and get a useful
answer. It optimises for three different cases (no arguments, only
files, and anything goes), so it performs well in all circumstances
I've tested.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:57:22 -0700] rev 1030
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:53:13 -0700] rev 1029
Emacs: implement hg-incoming, hg-outgoing and hg-push.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:30:12 -0700] rev 1028
Add commands.debugconfig.
This lets us both view the actual config data that hg is using, and
drive editors that need to see this information.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 16:46:10 -0700] rev 1027
Emacs: fix up hg-log and hg-diff to operate more uniformly.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:42:06 -0700] rev 1026
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:30:06 -0700] rev 1025
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 15:27:17 -0700] rev 1024
Sync buffers prior to doing a diff.
mpm@selenic.com [Wed, 24 Aug 2005 03:33:54 -0700] rev 1023
Minor tweak to the revgen algorithm
mpm@selenic.com [Wed, 24 Aug 2005 03:32:08 -0700] rev 1022
Minor hgwebdir tweaks
- ignore / for PATH_INFO
- fix // in URLs
mpm@selenic.com [Wed, 24 Aug 2005 00:38:36 -0700] rev 1021
Add Makefile to the manifest
mpm@selenic.com [Wed, 24 Aug 2005 00:36:12 -0700] rev 1020
Add default make rule
The default make rule builds the extensions "in-place" so that hg can
be run out of the working directory.
mpm@selenic.com [Wed, 24 Aug 2005 00:32:10 -0700] rev 1019
Create helper functions for I/O to files in the working directory
This simplifies some code and gives us a single place to add I/O
filters.
mpm@selenic.com [Wed, 24 Aug 2005 00:12:04 -0700] rev 1018
Add some aliases
mpm@selenic.com [Wed, 24 Aug 2005 00:09:56 -0700] rev 1017
Fix up help for binary options
mpm@selenic.com [Tue, 23 Aug 2005 20:21:52 -0700] rev 1016
Teach annotate about binary files
mpm@selenic.com [Tue, 23 Aug 2005 19:58:46 -0700] rev 1015
Add automatic binary file detection to diff and export
Based on a patch by Fuming Wang
- add util.binary which decides whether a file is binary if it has any NUL
characters in the first 1K.
- teach mdiff.unidiff to print "binary file <x> has changed" for binary files
- add text flag to cause unidiff and dodiff to treat all files as text
- add -a and --text flags (like diff(1)) to hg diff and export
- update docs
mpm@selenic.com [Tue, 23 Aug 2005 18:58:26 -0700] rev 1014
Clean up argument passing for dodiff
mpm@selenic.com [Tue, 23 Aug 2005 16:19:14 -0700] rev 1013
Deal with repos with missing timezones
mpm@selenic.com [Tue, 23 Aug 2005 15:15:14 -0700] rev 1012
Merge with BOS
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 14:51:52 -0700] rev 1011
Emacs: search for hg in path before looking in funny places.
mpm@selenic.com [Tue, 23 Aug 2005 14:21:19 -0700] rev 1010
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 19:56:52 +0200] rev 1009
Don't show the diff in hgeditor if there are no changes in file contents.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:46:43 +0200] rev 1008
Add Makefile for generating release tarballs.
- test suite is run
- documentation is generated and included
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:39:44 +0200] rev 1007
Include generated documentation in MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:33:02 +0200] rev 1006
Generate html documentation by default, too.
mpm@selenic.com [Tue, 23 Aug 2005 14:20:17 -0700] rev 1005
Merge with BOS
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:29:55 -0700] rev 1004
Emacs: improved GNU Emacs support.
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:08:20 -0700] rev 1003
Emacs support: numerous changes.
Most SCM commands now work in derived buffers (e.g. diff viewing
buffers) as well as buffers backed by files.
diff and log now work properly on repositories and files.
Commit support is more solid.
Doc strings are better.
bos@eng-25.internal.keyresearch.com [Mon, 22 Aug 2005 13:06:43 -0700] rev 1002
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:41:09 -0700] rev 1001
Emacs: update mode lines properly after commit.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:27:27 -0700] rev 1000
Emacs: kill commit buffer once it's done with.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:16:32 -0700] rev 999
Emacs: first cut at commit support.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:33:02 -0800] rev 998
contrib/patchbomb: Fix buglet with empty cc list.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:03:14 -0800] rev 997
Fix handling of addresses in hgrc.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 22:46:57 -0800] rev 996
Emacs: document existing functions.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 21:51:01 -0800] rev 995
Emacs support: add hg-revert-buffer.
mpm@selenic.com [Tue, 23 Aug 2005 12:46:43 -0700] rev 994
Fix callers to file.revision to use file.read
This was causing unchanged files to show up as modified.
mpm@selenic.com [Tue, 23 Aug 2005 02:19:38 -0700] rev 993
Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
mpm@selenic.com [Mon, 22 Aug 2005 01:22:29 -0700] rev 992
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
mpm@selenic.com [Sun, 21 Aug 2005 22:03:36 -0700] rev 991
merge: remove remaining mark bits
mpm@selenic.com [Sun, 21 Aug 2005 21:59:55 -0700] rev 990
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
mpm@selenic.com [Sun, 21 Aug 2005 16:51:50 -0700] rev 989
Reformat debugindex output
mpm@selenic.com [Sun, 21 Aug 2005 16:00:07 -0700] rev 988
Remove unused relfilter function
mpm@selenic.com [Sun, 21 Aug 2005 15:56:14 -0700] rev 987
hgweb: change startup argument processing
- allow passing a repo object instead of a path
(if we get a string, we construct a repo object)
- hg serve: pass options via repo.ui.setconfig
- add --style option
- get default name from repo.root rather than getcwd()
- remove template argument to hgweb()
- reduce create_server from 8 args to 1
mpm@selenic.com [Sun, 21 Aug 2005 15:00:02 -0700] rev 986
Add web:style option
mpm@selenic.com [Sun, 21 Aug 2005 13:18:45 -0700] rev 985
hgweb: fix RSS and raw for new % scheme
mpm@selenic.com [Sun, 21 Aug 2005 11:52:52 -0700] rev 984
Remove debug print
mpm@selenic.com [Sun, 21 Aug 2005 11:46:39 -0700] rev 983
Fix RSS feeds
mpm@selenic.com [Sat, 20 Aug 2005 13:11:36 -0700] rev 982
hgweb: convert index entries to list expansion style
mpm@selenic.com [Sat, 20 Aug 2005 13:08:07 -0700] rev 981
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:59:47 -0500] rev 980
Merge with MPM
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:32:47 -0500] rev 979
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:08:15 -0500] rev 978
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:03:28 -0500] rev 977
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:59:02 -0500] rev 976
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:45:44 -0500] rev 975
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:14:20 -0500] rev 974
Added support for #foo%bar# syntax
This required moving template() into the templater class
mpm@selenic.com [Sat, 20 Aug 2005 11:59:10 -0700] rev 973
Deal with non-integer date offsets generated by some tools
mpm@selenic.com [Sat, 20 Aug 2005 01:46:57 -0700] rev 972
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com [Sat, 20 Aug 2005 01:35:45 -0700] rev 971
Remove call to non-existent date_parser
mpm@selenic.com [Sat, 20 Aug 2005 01:29:04 -0700] rev 970
Fix possible unitialized variable warnings
mpm@selenic.com [Sat, 20 Aug 2005 00:49:41 -0700] rev 969
Minor README updates
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:26:32 -0800] rev 968
[PATCH] Take DST into account
Right now, mercurial doesn't take daylight saving time into account
because it uses time.timezone inconditionally, instead of resorting to
time.altzone if daylight saving time is on.
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:23:42 -0800] rev 967
[PATCH] Print timezone offset when outputting dates
Example:
% hg log | head -12
changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a
tag: tip
user: Samuel Tardieu <sam@rfc1149.net>
date: Mon Jul 25 13:24:15 2005 +0200
summary: Parse various date formats when accepting user specified dates
[...]
changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73
parent: 785:31a80e3723cee0a5991340facb2707e71983eb41
user: Bryan O'Sullivan <bos@serpentine.com>
date: Sun Jul 24 00:39:24 2005 -0800
summary: Get "forget" command to use new walk code.
[...]
mpm@selenic.com [Fri, 19 Aug 2005 23:07:31 -0800] rev 966
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com [Fri, 19 Aug 2005 22:48:43 -0800] rev 965
Use post-expanded clone pathname as default
mpm@selenic.com [Fri, 19 Aug 2005 22:12:40 -0800] rev 964
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com [Fri, 19 Aug 2005 22:11:48 -0800] rev 963
Add -e and --remotecmd for clone and pull too
mpm@selenic.com [Fri, 19 Aug 2005 21:47:46 -0800] rev 962
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com [Fri, 19 Aug 2005 21:36:57 -0800] rev 961
Add --ssh and --remotecmd to push
This uses the new setconfig options passing mechanism
mpm@selenic.com [Fri, 19 Aug 2005 21:25:25 -0800] rev 960
Add ui.setconfig overlay
This can simplify option passing
mpm@selenic.com [Fri, 19 Aug 2005 18:56:20 -0800] rev 959
Fix option parsing bug for empty short options
mpm@selenic.com [Fri, 19 Aug 2005 18:47:05 -0800] rev 958
Make mercurial.el load with GNU emacs
mpm@selenic.com [Fri, 19 Aug 2005 17:22:04 -0800] rev 957
hgweb: sort repository list
mpm@selenic.com [Fri, 19 Aug 2005 17:01:11 -0800] rev 956
Fix hgwebdir virtual start-up
mpm@selenic.com [Fri, 19 Aug 2005 16:51:44 -0800] rev 955
Remove -C alias for --cwd
mpm@selenic.com [Fri, 19 Aug 2005 16:46:31 -0800] rev 954
Add hgwebdir.cgi to MANIFEST.in
mpm@selenic.com [Fri, 19 Aug 2005 16:45:25 -0800] rev 953
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Fri, 19 Aug 2005 06:04:46 +0100] rev 952
bash_completion: support GNU sed 3 and non-GNU sed
replaced command 'Q' introduced in GNU sed 4, in order to support
platforms with older sed.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 21:35:36 +0100] rev 951
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 13:55:45 +0100] rev 950
Removed TODO from MANIFEST.in
TK Soh <teekaysoh@yahoo.com> [Thu, 18 Aug 2005 13:33:39 +0100] rev 949
test fixes for Solaris 2.6
Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.
mpm@selenic.com [Fri, 19 Aug 2005 16:43:30 -0800] rev 948
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Fri, 19 Aug 2005 06:41:29 -0800] rev 947
In-progress Emacs snapshot.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 17:49:43 -0800] rev 946
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:32:15 -0800] rev 945
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:27:57 -0800] rev 944
Initial skeleton for mercurial.el.