Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/list-tree.py
author Martin von Zweigbergk <martinvonz@google.com>
Sat, 13 Apr 2019 00:24:17 -0700
changeset 42161 7815cf0ea88b
parent 35380 acff41957b34
child 43076 2372284d9457
permissions -rw-r--r--
tests: add test for issue5343 (grafting with copies) It seems that issue5353 resulted in a lot of tests in test-graft.t, but the bug actually reported in that issue didn't get a test case. This patch adds one for the "move" and one for the "copy" version of it. I also added a "copy+modify" case, to show what should be a merge conflict. I didn't add one for the "backwards" version of it since the comment says that that was already covered by previous work. The tests added by this patch show the broken behavior (the bug is still open). I suspect the results returned from mergecopies() are not expressive enough to fix this issue: it has a dict for copies to merge with, but that can only give one more filename, but here we need two (one for the path on the remote side and one for the path in the merge base). I want to have it tested anyway since I'm about to refactor mergecopies(). Differential Revision: https://phab.mercurial-scm.org/D6242
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
35217
aa905f9cdcda tests: write and use a custom helper script to avoid find's -printf
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
from __future__ import (
aa905f9cdcda tests: write and use a custom helper script to avoid find's -printf
Augie Fackler <augie@google.com>
parents:
diff changeset 
     2
 
    absolute_import,
aa905f9cdcda tests: write and use a custom helper script to avoid find's -printf
Augie Fackler <augie@google.com>
parents:
diff changeset 
     3
 
    print_function,
aa905f9cdcda tests: write and use a custom helper script to avoid find's -printf
Augie Fackler <augie@google.com>
parents:
diff changeset 
     4
 
)
aa905f9cdcda tests: write and use a custom helper script to avoid find's -printf
Augie Fackler <augie@google.com>
parents:
diff changeset 
     5
 












aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     6


import argparse













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     7


import os













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     8














aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


ap = argparse.ArgumentParser()













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10


ap.add_argument('path', nargs='+')













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    11


opts = ap.parse_args()













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    12














aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    13


def gather():













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    14


    for p in opts.path:













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15


        if not os.path.exists(p):













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    16


            return













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    17


        if os.path.isdir(p):













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18


            yield p + os.path.sep













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19


            for dirpath, dirs, files in os.walk(p):













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    20


                for d in dirs:













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    21


                    yield os.path.join(dirpath, d) + os.path.sep













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    22


                for f in files:













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    23


                    yield os.path.join(dirpath, f)













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    24


        else:













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    25


            yield p













aa905f9cdcda
tests: write and use a custom helper script to avoid find's -printf



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    26









35380






acff41957b34
tests: stabilize the sorted output of list-tree.py on Windows



Matt Harbison <matt_harbison@yahoo.com>


parents: 
35217

diff
changeset




    27


print('\n'.join(sorted(gather(), key=lambda x: x.replace(os.path.sep, '/'))))















Mercurial