Fri, 23 Sep 2005 17:50:03 -0700 Fix up some bugs for log and grep with empty repo
mpm@selenic.com [Fri, 23 Sep 2005 17:50:03 -0700] rev 1337
Fix up some bugs for log and grep with empty repo
Fri, 23 Sep 2005 17:19:35 -0700 hgweb file: fixed left-justified line numbers on IE v6.0
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.
Fri, 23 Sep 2005 17:15:36 -0700 git -> hg conversion script
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
Fri, 23 Sep 2005 17:15:10 -0700 hgweb: fixed IE display problem on changelog page
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.
Fri, 23 Sep 2005 17:08:45 -0700 hgweb: fix date bug in hgweb diff generation
mpm@selenic.com [Fri, 23 Sep 2005 17:08:45 -0700] rev 1333
hgweb: fix date bug in hgweb diff generation
Fri, 23 Sep 2005 10:32:19 -0700 Help debugability: print ssh command being used when --verbose.
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.
Fri, 23 Sep 2005 10:31:00 -0700 Write hgrc file in text mode, even on Windows.
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.
Fri, 23 Sep 2005 10:30:41 -0700 Give ssh a better chance of working 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.
Fri, 23 Sep 2005 10:28:55 -0700 Allow files to be opened in text mode, even on Windows.
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.
Fri, 23 Sep 2005 07:41:25 -0700 Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 07:41:25 -0700] rev 1328
Merge with myself.
Fri, 23 Sep 2005 07:36:30 -0700 Some repos represent a date as a float.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 07:36:30 -0700] rev 1327
Some repos represent a date as a float.
Fri, 23 Sep 2005 00:06:49 -0700 Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 00:06:49 -0700] rev 1326
Merge with MPM.
Fri, 23 Sep 2005 00:05:16 -0700 Move urllib error handling from revlog into statichttprepo, where it belongs.
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.
Thu, 22 Sep 2005 23:38:04 -0700 hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com [Thu, 22 Sep 2005 23:38:04 -0700] rev 1324
hgweb: pass date tuples around rather than whole changesets for dates
Thu, 22 Sep 2005 23:33:26 -0700 Fix old-http test when no server exists.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:33:26 -0700] rev 1323
Fix old-http test when no server exists.
Thu, 22 Sep 2005 23:31:44 -0700 Make revlog constructor more discerning in its treatment of errors.
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.
Thu, 22 Sep 2005 23:19:47 -0700 Clean up date and timezone handling.
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.
Thu, 22 Sep 2005 22:46:50 -0700 Fix up representation of dates in hgweb.
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.
Thu, 22 Sep 2005 21:42:33 -0700 Fix behaviour of commit.
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.
Thu, 22 Sep 2005 21:29:02 -0700 Unify display of dates.
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.
Thu, 22 Sep 2005 21:15:57 -0700 Print commit time/date from perspective of committer.
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.
Thu, 22 Sep 2005 10:12:42 -0700 Hook fixups
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
Thu, 22 Sep 2005 09:47:27 -0700 Fix setting of hg default when using --pull on clone of local repository.
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.
Thu, 22 Sep 2005 09:47:03 -0700 Fix default clone destination
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.
(0) -1000 -300 -100 -50 -24 +24 +50 +100 +300 +1000 +3000 +10000 +30000 tip