Mercurial > hg
comparison mercurial/commands.py @ 22310:aabf367306d5
debugdag: stop wrongly sorting parents
The dag being dumped is not in a format that allows us to reconstruct the
original dag as the parent revisions are normalised.
| author | Henrik Stuart <hg@hstuart.dk> |
|---|---|
| date | Sat, 30 Aug 2014 11:56:33 +0200 |
| parents | bdc0e04df243 |
| children | 5038dee5bdd6 |
comparison
equal
deleted
inserted
replaced
| 22309:a65697c3f20e | 22310:aabf367306d5 |
|---|---|
| 1903 if file_: | 1903 if file_: |
| 1904 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | 1904 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
| 1905 revs = set((int(r) for r in revs)) | 1905 revs = set((int(r) for r in revs)) |
| 1906 def events(): | 1906 def events(): |
| 1907 for r in rlog: | 1907 for r in rlog: |
| 1908 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) | 1908 yield 'n', (r, list(p for p in rlog.parentrevs(r) |
| 1909 if p != -1))) | 1909 if p != -1)) |
| 1910 if r in revs: | 1910 if r in revs: |
| 1911 yield 'l', (r, "r%i" % r) | 1911 yield 'l', (r, "r%i" % r) |
| 1912 elif repo: | 1912 elif repo: |
| 1913 cl = repo.changelog | 1913 cl = repo.changelog |
| 1914 tags = opts.get('tags') | 1914 tags = opts.get('tags') |
| 1923 if branches: | 1923 if branches: |
| 1924 newb = cl.read(cl.node(r))[5]['branch'] | 1924 newb = cl.read(cl.node(r))[5]['branch'] |
| 1925 if newb != b: | 1925 if newb != b: |
| 1926 yield 'a', newb | 1926 yield 'a', newb |
| 1927 b = newb | 1927 b = newb |
| 1928 yield 'n', (r, list(set(p for p in cl.parentrevs(r) | 1928 yield 'n', (r, list(p for p in cl.parentrevs(r) |
| 1929 if p != -1))) | 1929 if p != -1)) |
| 1930 if tags: | 1930 if tags: |
| 1931 ls = labels.get(r) | 1931 ls = labels.get(r) |
| 1932 if ls: | 1932 if ls: |
| 1933 for l in ls: | 1933 for l in ls: |
| 1934 yield 'l', (r, l) | 1934 yield 'l', (r, l) |