diff --git a/site_ansto/instrument/compareSICS.py b/site_ansto/instrument/compareSICS.py index b2722cdf..b92de2f4 100755 --- a/site_ansto/instrument/compareSICS.py +++ b/site_ansto/instrument/compareSICS.py @@ -245,7 +245,7 @@ if __name__ == "__main__": for line in delta: print line - print "Changed file count:", len(delta_list) + print "Changed file count: %d/%d" % (len(delta_list), len(sigma_list)) if args.gitreferall: print "gitrefer", diff --git a/site_ansto/instrument/util/gitloader.py b/site_ansto/instrument/util/gitloader.py index d06d6765..74f8652e 100644 --- a/site_ansto/instrument/util/gitloader.py +++ b/site_ansto/instrument/util/gitloader.py @@ -30,6 +30,8 @@ def populate_data(): (commit_hash, timestamp, repr(message))) cmd = "git ls-tree -r " + tree_hash + if args.full: + cmd += " --full-tree" ls_txt, err = subprocess.Popen(shlex.split(cmd),\ stdout=subprocess.PIPE,\ stderr=subprocess.PIPE).communicate() @@ -56,8 +58,9 @@ if __name__ == "__main__": import argparse import cProfile parser = argparse.ArgumentParser() - parser.add_argument("-b", "--branch", default="HEAD", help="load for branch [HEAD]") + parser.add_argument("-b", "--branch", default="HEAD", help="git branch [HEAD]") parser.add_argument("-d", "--debug", action="store_true", help="debugging output") + parser.add_argument("-f", "--full", action="store_true", help="git --full-tree") parser.add_argument("-p", "--profile", action="store_true", help="profile output") args = parser.parse_args() if args.profile: diff --git a/site_ansto/instrument/util/gitrefer.py b/site_ansto/instrument/util/gitrefer.py index 0080ffe0..fd01ddce 100644 --- a/site_ansto/instrument/util/gitrefer.py +++ b/site_ansto/instrument/util/gitrefer.py @@ -144,7 +144,8 @@ def main_program(): if '-' in rng: lo, hi = rng.split('-') if lo.isdigit() and hi.isdigit(): - Summary.add(range(int(lo), int(hi)+1)) + for idx in range(int(lo), int(hi)+1): + Summary.add(idx) else: if rng.isdigit(): Summary.add(int(rng))