From: Mark Jamsek Subject: Re: got {diff,log,update} -c KEYWORD (cf. svn revision keywords) To: Mark Jamsek Cc: Stefan Sperling , gameoftrees@openbsd.org Date: Fri, 14 Jul 2023 00:59:15 +1000 Mark Jamsek wrote: > Stefan Sperling wrote: > > On Wed, Jul 12, 2023 at 07:50:29PM +0200, Christian Weisgerber wrote: > > > I guess "HEAD" is already special in git/got. Would it make sense > > > to use a special symbol instead of "BASE", e.g. "."? > > > > Following this line of questioning, how can we deal with the > > situation where a user creates branches such as HEAD or BASE? > > > > Should we add a reserved symbol prefix which forces keyword evaluation > > instead of reference resolution? > > > > got update -c BASE # use work tree base while branch BASE doesn't exist > > got branch BASE # create the branch > > got update -c BASE # now uses the BASE branch refs/heads/BASE > > got update -c refs/heads/BASE # same > > got update -c :BASE # force use of the BASE keyword > > got update -c :BASE-2 # force use of keyword and resolve ancestors > > > > Should we always require a prefix symbol to be specified for keywords? > > > > got update -c BASE # errors if branch BASE does not exist > > got update -c :BASE # use work tree base > > got update -c :BASE:-2 # same, and resolve ancestors > > got update -c main:-2 # use with regular refs needs only one colon > > > > I am leaning towards the latter since it does not carry any risk of > > changes in our run-time behaviour depending on branches being created > > and deleted again. > > Yes, I like it [the latter]! > > Come to think of it, this is what we did in fossil, too, to avoid > ambiguities, albeit with an extra keyword (e.g., tag:, root:, start:) > before the colon. But I think the prefixed colon will suffice! > Alternatively, in the first case: > > got update -c BASE # branch BASE if it exists, else worktree base > got update -c :BASE # use work tree base > got update -c :BASE:-2 # same, and resolve ancestors > got update -c main:-2 # use with regular refs needs only one colon > > But perhaps it will be better to make :KEYWORD explicit all the time. > > In any case, I'll make some tweaks and see how it looks. The below diff makes the discussed changes to the keyword syntax, and adds the ":(+|-)[N]" modifier to reference names. This enables: got up -cmain:-2 # 2nd gen ancestor of main got up -cfoo:+N # Nth gen descendant of foo got up -c:base:+ # 1st gen descendant of work tree base commit got up -c:head:-4 # 4th gen ancestor of HEAD got up -cbase:- # 1st gen descendant of ref "base" Tests and docs have been tweaked to cover the changes, and I have also added a little cover for the newly added ability of reference modifiers (e.g., -cmain:+). However, I will expand regress to add some contrived and non-trivial cases before adding support for temporal expressions and further improvements. I wanted to get this out to confirm that we indeed do like the syntax and are happy with this direction. diffstat refs/remotes/origin/main refs/heads/main M got/got.1 | 114+ 0- M got/got.c | 273+ 1- M regress/cmdline/common.sh | 6+ 0- M regress/cmdline/diff.sh | 249+ 0- M regress/cmdline/log.sh | 104+ 0- M regress/cmdline/update.sh | 263+ 0- 6 files changed, 1009 insertions(+), 1 deletion(-) diff refs/remotes/origin/main refs/heads/main commit - b161263abf48e69eb1f05028b633808dfe337357 commit + 78a1703ec161ec21eb7825527d0badea40230bc0 blob - ea3b833f1bc15d5ea3e276e75da0a16f1e29702c blob + 6bfb6097c9169b2a18264006c657a13145a78816 --- got/got.1 +++ got/got.1 @@ -698,6 +698,42 @@ If this option is not specified, the most recent commi or tag name which will be resolved to a commit ID. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique. +The special +.Ar commit +keywords +.Qq :base +and +.Qq :head +can also be used to represent the work tree's base commit +and HEAD reference, respectively. +Keywords and reference names may be appended with +.Qq :+ +or +.Qq :- +modifiers and an optional integer N to denote the +Nth descendant or antecedent, respectively, by first parent traversal; +for example, +.Sy :head:-2 +denotes the HEAD reference's 2nd generation ancestor, and +.Sy :base:+4 +denotes the 4th generation descendant of the work tree's base commit. +Similarly, +.Sy foo:-3 +will denote the 3rd generation ancestor of the commit resolved by the +.Qq foo +reference. +If an integer does not follow the +.Qq :+ +or +.Qq :- +modifier, a +.Qq 1 +is implicitly appended +.Po e.g., +.Sy :head:- +is equivalent to +.Sy :head:-1 +.Pc . If this option is not specified, the most recent commit on the work tree's branch will be used. .It Fl q @@ -857,6 +893,45 @@ If this option is not specified, default to the work t or tag name which will be resolved to a commit ID. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique. +The special +.Ar commit +keywords +.Qq :base +and +.Qq :head +can also be used to represent the work tree's base commit +and HEAD reference, respectively. +The former is only valid if invoked in a work tree, while the latter will +resolve to the tip of the work tree's current branch if invoked in a +work tree, otherwise it will resolve to the repository's HEAD reference. +Keywords and references may be appended with +.Qq :+ +or +.Qq :- +modifiers and an optional integer N to denote the +Nth descendant or antecedent, respectively, by first parent traversal; +for example, +.Sy :head:-2 +denotes the HEAD reference's 2nd generation ancestor, and +.Sy :base:+4 +denotes the 4th generation descendant of the work tree's base commit. +Similarly, +.Sy bar:+3 +will denote the 3rd generation descendant of the commit resolved by the +.Qq bar +reference. +A +.Qq :+ +or +.Qq :- +modifier without a trailing integer has an implicit +.Qq 1 +appended +.Po e.g., +.Sy :base:+ +is equivalent to +.Sy :base:+1 +.Pc . If this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference. .It Fl d @@ -981,6 +1056,45 @@ automatically, provided the abbreviation is unique. or tag name which will be resolved to a commit ID. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique. +The special +.Ar commit +keywords +.Qq :base +and +.Qq :head +can also be used to represent the work tree's base commit +and HEAD reference, respectively. +The former is only valid if invoked in a work tree, while the latter will +resolve to the tip of the work tree's current branch if invoked in a +work tree, otherwise it will resolve to the repository's HEAD reference. +Keywords and references may be appended with +.Qq :+ +or +.Qq :- +modifiers and an optional integer N to denote the +Nth descendant or antecedent, respectively, by first parent traversal; +for example, +.Sy :head:-2 +denotes the HEAD reference's 2nd generation ancestor, and +.Sy :base:+4 +denotes the 4th generation descendant of the work tree's base commit. +Similarly, +.Sy baz:+8 +will denote the 8th generation descendant of the commit resolved by the +.Qq baz +reference. +If an integer does not follow the +.Qq :+ +or +.Qq :- +modifier, a +.Qq 1 +is implicitly appended +.Po e.g., +.Sy :head:- +is equivalent to +.Sy :head:-1 +.Pc . .Pp If the .Fl c blob - 01fe4299c82e150fcd8020915536f48fc73bacbc blob + 281b8f77bfc4fbb20915cb16afb04ce0318d0b66 --- got/got.c +++ got/got.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -3465,7 +3466,244 @@ static const struct got_error * return err; } +/* + * Commit keywords to specify references in the repository + * (cf. svn keywords, fossil special tags, hg revsets). + */ +#define GOT_KEYWORD_BASE ":base" /* work tree base commit */ +#define GOT_KEYWORD_HEAD ":head" /* worktree/repo HEAD commit */ +#define GOT_KEYWORD_BASE_LEN (sizeof(GOT_KEYWORD_BASE) - 1) +#define GOT_KEYWORD_HEAD_LEN (sizeof(GOT_KEYWORD_HEAD) - 1) + +struct keyword_mod { + uint64_t n; + uint8_t sym; + uint8_t iskeyword; +}; + +#define GOT_KEYWORD_DESCENDANT '+' +#define GOT_KEYWORD_ANCESTOR '-' + static const struct got_error * +keyword_modifier(struct keyword_mod *kwm, const char *keyword, size_t kwlen) +{ + const char *p0, *p = keyword + kwlen -1; + uint8_t symbol = 0; + + /* check if keyword or modifier indicator is present */ + p0 = strchr(keyword, ':'); + if (p0 == NULL) + return NULL; + + kwm->iskeyword = 1; + + /* find ancestor/descendant symbol at start of modifier: :(+|-)[N] */ + while (p > keyword && *p >= '0' && *p <= '9') + --p; + if (*p == GOT_KEYWORD_DESCENDANT || *p == GOT_KEYWORD_ANCESTOR) + symbol = *p; + + if (symbol) { + unsigned long long max; + unsigned long long n = 0; + size_t len = p - keyword; + + max = ((unsigned long long)LLONG_MIN) / 10 + 1; + + /* + * Don't overflow. Max valid request is whichever is greatest + * between the commit corresponding to keyword and either HEAD + * or ROOT, but just make sure not to overflow. If n extends + * beyond HEAD/ROOT, use HEAD/ROOT instead of a hard error. + */ + while (++p < keyword + kwlen) { + if (n > max) + return got_error_fmt(GOT_ERR_NO_SPACE, + "keyword modifier too large: %s", keyword); + n = n * 10 + (*p - '0'); + } + + if (n == 0 && len == kwlen - 1) + n = 1; /* keyword:(+/-) with no N == keyword:(+/-)1 */ + + kwm->n = n; + kwm->sym = symbol; + } + + return NULL; +} + +/* + * Check if keyword matches "base" or "head" with optional trailing modifier: + * keyword:(+/-)N Nth generation descendant/antecedent of keyword + * keyword:(+/-) 1st generation descendant/antecedent of keyword + * keyword commit pointed to by keyword + * Or if keyword is a valid reference _with_ a trailing modifier: + * ref:(+/-)[N] Nth generation descendant/antecedent of ref + * If a match is found, return the corresponding commit id string in *ret, + * of which the caller takes ownership and must free. + * Otherwise *ret will contain NULL to indicate a match was not found. + * If the modifier is greater than the number of ancestors/descendants, + * return the id string of the oldest/most recent commit (i.e., ROOT/HEAD). + */ +static const struct got_error * +keyword_to_idstr(char **ret, const char *keyword, struct got_repository *repo, + struct got_worktree *wt) +{ + const struct got_error *err = NULL; + struct got_commit_graph *graph = NULL; + struct got_object_id *head_id = NULL, *kwid = NULL; + struct got_object_id iter_id; + struct got_reflist_head refs; + struct got_object_id_queue commits; + struct got_object_qid *qid; + struct keyword_mod kwm; + char *kwid_str = NULL; + uint64_t n = 0; + + *ret = NULL; + TAILQ_INIT(&refs); + STAILQ_INIT(&commits); + memset(&kwm, 0, sizeof(kwm)); + + err = keyword_modifier(&kwm, keyword, strlen(keyword)); + if (err != NULL || !kwm.iskeyword) + return err; + + if (strncmp(keyword, GOT_KEYWORD_BASE, GOT_KEYWORD_BASE_LEN) == 0) { + if (wt == NULL) + return got_error_msg(GOT_ERR_NOT_WORKTREE, + "'-c "GOT_KEYWORD_BASE"' requires work tree"); + + err = got_object_id_str(&kwid_str, + got_worktree_get_base_commit_id(wt)); + if (err != NULL) + return err; + } else if (strncmp(keyword, + GOT_KEYWORD_HEAD, GOT_KEYWORD_HEAD_LEN) == 0) { + struct got_reference *head_ref; + + err = got_ref_open(&head_ref, repo, wt != NULL ? + got_worktree_get_head_ref_name(wt) : GOT_REF_HEAD, 0); + if (err != NULL) + return err; + + kwid_str = got_ref_to_str(head_ref); + got_ref_close(head_ref); + if (kwid_str == NULL) + return got_error_from_errno("got_ref_to_str"); + } else if (*keyword == ':') { + /* unknown keyword: caller will report "reference not found" */ + return NULL; + } else { + /* must be "reference:[(+|-)[N]]" */ + kwid_str = strdup(keyword); + if (kwid_str == NULL) + return got_error_from_errno("strdup"); + kwid_str[strcspn(kwid_str, ":")] = '\0'; + } + + if (kwm.n == 0) + goto done; /* unmodified keyword */ + + err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL); + if (err) + goto done; + + err = got_repo_match_object_id(&kwid, NULL, kwid_str, + GOT_OBJ_TYPE_COMMIT, &refs, repo); + if (err != NULL) + goto done; + + /* + * If looking for a descendant, we need to iterate from + * HEAD so grab its id now if it's not already in kwid. + */ + if (kwm.sym == GOT_KEYWORD_DESCENDANT && + strncmp(keyword, GOT_KEYWORD_HEAD, GOT_KEYWORD_HEAD_LEN) != 0) { + struct got_reference *head_ref; + + err = got_ref_open(&head_ref, repo, wt != NULL ? + got_worktree_get_head_ref_name(wt) : GOT_REF_HEAD, 0); + if (err != NULL) + goto done; + err = got_ref_resolve(&head_id, repo, head_ref); + got_ref_close(head_ref); + if (err != NULL) + goto done; + } + + err = got_commit_graph_open(&graph, "/", 1); + if (err) + goto done; + + err = got_commit_graph_iter_start(graph, + head_id != NULL ? head_id : kwid, repo, check_cancelled, NULL); + if (err) + goto done; + + while (n <= kwm.n) { + err = got_commit_graph_iter_next(&iter_id, graph, repo, + check_cancelled, NULL); + if (err) { + if (err->code == GOT_ERR_ITER_COMPLETED) + err = NULL; + break; + } + + if (kwm.sym == GOT_KEYWORD_DESCENDANT) { + /* + * We want the Nth generation descendant of KEYWORD, + * so queue all commits from HEAD to KEYWORD then we + * can walk from KEYWORD to its Nth gen descendent. + */ + err = got_object_qid_alloc(&qid, &iter_id); + if (err) + goto done; + STAILQ_INSERT_HEAD(&commits, qid, entry); + + if (got_object_id_cmp(&iter_id, kwid) == 0) + break; + continue; + } + ++n; + } + + if (kwm.sym == GOT_KEYWORD_DESCENDANT) { + n = 0; + + STAILQ_FOREACH(qid, &commits, entry) { + if (qid == STAILQ_LAST(&commits, got_object_qid, entry) + || n == kwm.n) + break; + ++n; + } + + memcpy(&iter_id, &qid->id, sizeof(iter_id)); + + } + + free(kwid_str); + err = got_object_id_str(&kwid_str, &iter_id); + +done: + free(kwid); + free(head_id); + got_ref_list_free(&refs); + got_object_id_queue_free(&commits); + if (graph != NULL) + got_commit_graph_close(graph); + + if (err != NULL) { + free(kwid_str); + return err; + } + + *ret = kwid_str; + return NULL; +} + +static const struct got_error * cmd_update(int argc, char *argv[]) { const struct got_error *error = NULL; @@ -3565,11 +3803,24 @@ cmd_update(int argc, char *argv[]) goto done; } else { struct got_reflist_head refs; + char *keyword_idstr = NULL; + TAILQ_INIT(&refs); + error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL); if (error) goto done; + + error = keyword_to_idstr(&keyword_idstr, commit_id_str, repo, + worktree); + if (error != NULL) + goto done; + if (keyword_idstr != NULL) { + free(commit_id_str); + commit_id_str = keyword_idstr; + } + error = got_repo_match_object_id(&commit_id, NULL, commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo); got_ref_list_free(&refs); @@ -4730,8 +4981,18 @@ cmd_log(int argc, char *argv[]) goto done; got_object_commit_close(commit); } else { + char *keyword_idstr = NULL; + + error = keyword_to_idstr(&keyword_idstr, start_commit, repo, + worktree); + if (error != NULL) + goto done; + if (keyword_idstr != NULL) + start_commit = keyword_idstr; + error = got_repo_match_object_id(&start_id, NULL, start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo); + free(keyword_idstr); if (error != NULL) goto done; } @@ -5232,13 +5493,24 @@ cmd_diff(int argc, char *argv[]) if (error) goto done; for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) { - const char *arg; + const char *arg; + char *keyword_idstr = NULL; + if (ncommit_args > 0) arg = commit_args[i]; else arg = argv[i]; + + error = keyword_to_idstr(&keyword_idstr, arg, repo, + worktree); + if (error != NULL) + goto done; + if (keyword_idstr != NULL) + arg = keyword_idstr; + error = got_repo_match_object_id(&ids[i], &labels[i], arg, obj_type, &refs, repo); + free(keyword_idstr); if (error) { if (error->code != GOT_ERR_NOT_REF && error->code != GOT_ERR_NO_OBJ) blob - f8c6bfd3e10294f056b420f98add07f8c8d0dd33 blob + fa848632bdd2c520f0e5186a325f388de3cc8c4b --- regress/cmdline/common.sh +++ regress/cmdline/common.sh @@ -140,6 +140,12 @@ git_commit_tree() echo ${id%$pat} } +pop_id() +{ + shift "$1" + printf '%s' "${1:-index-out-of-bounds}" +} + git_commit_tree() { local repo="$1" blob - 03e05611a400a2ffc9c91e307d0d5c048fdc6cf3 blob + 592e477643b13ce4e2a8ce6037f11ee4ba539cdf --- regress/cmdline/diff.sh +++ regress/cmdline/diff.sh @@ -2022,6 +2022,254 @@ test_parseargs "$@" test_done "$testroot" "$ret" } +test_diff_commit_keywords() { + local testroot=`test_init diff_commit_keywords` + + got checkout $testroot/repo $testroot/wt > /dev/null + ret=$? + if [ $ret -ne 0 ]; then + echo "checkout failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + + set -A ids "$(git_show_head $testroot/repo)" + set -A alpha_ids "$(get_blob_id $testroot/repo "" alpha)" + set -A beta_ids "$(get_blob_id $testroot/repo "" beta)" + + for i in `seq 8`; do + if [ $(( i % 2 )) -eq 0 ]; then + echo "alpha change $i" > "$testroot/wt/alpha" + else + echo "beta change $i" > "$testroot/wt/beta" + fi + + (cd "$testroot/wt" && got ci -m "commit number $i" > /dev/null) + ret=$? + if [ $ret -ne 0 ]; then + echo "commit failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + + if [ $(( i % 2 )) -eq 0 ]; then + set -- "$alpha_ids" \ + "$(get_blob_id $testroot/repo "" alpha)" + alpha_ids=$* + else + set -- "$beta_ids" \ + "$(get_blob_id $testroot/repo "" beta)" + beta_ids=$* + fi + + set -- "$ids" "$(git_show_head $testroot/repo)" + ids=$* + done + + echo "diff $(pop_id 7 $ids) $(pop_id 8 $ids)" > \ + $testroot/stdout.expected + echo "commit - $(pop_id 7 $ids)" >> $testroot/stdout.expected + echo "commit + $(pop_id 8 $ids)" >> $testroot/stdout.expected + echo "blob - $(pop_id 4 $beta_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 5 $beta_ids)" >> $testroot/stdout.expected + echo '--- beta' >> $testroot/stdout.expected + echo '+++ beta' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-beta change 5' >> $testroot/stdout.expected + echo '+beta change 7' >> $testroot/stdout.expected + + (cd $testroot/wt && got diff -cmaster:- > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "diff failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + (cd $testroot/wt && got update -c:head:-6 > /dev/null) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + echo "diff $(pop_id 1 $ids) $(pop_id 2 $ids)" > \ + $testroot/stdout.expected + echo "commit - $(pop_id 1 $ids)" >> $testroot/stdout.expected + echo "commit + $(pop_id 2 $ids)" >> $testroot/stdout.expected + echo "blob - $(pop_id 1 $beta_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 2 $beta_ids)" >> $testroot/stdout.expected + echo '--- beta' >> $testroot/stdout.expected + echo '+++ beta' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-beta' >> $testroot/stdout.expected + echo '+beta change 1' >> $testroot/stdout.expected + + (cd $testroot/wt && got diff -c:base:- > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "diff failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "diff $(pop_id 3 $ids) $(pop_id 4 $ids)" > \ + $testroot/stdout.expected + echo "commit - $(pop_id 3 $ids)" >> $testroot/stdout.expected + echo "commit + $(pop_id 4 $ids)" >> $testroot/stdout.expected + echo "blob - $(pop_id 2 $beta_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 3 $beta_ids)" >> $testroot/stdout.expected + echo '--- beta' >> $testroot/stdout.expected + echo '+++ beta' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-beta change 1' >> $testroot/stdout.expected + echo '+beta change 3' >> $testroot/stdout.expected + + (cd $testroot/wt && got diff -c:base:+ > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "diff failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + # if modifier extends beyond HEAD, we should use HEAD ref + echo "diff $(pop_id 8 $ids) $(pop_id 9 $ids)" > \ + $testroot/stdout.expected + echo "commit - $(pop_id 8 $ids)" >> $testroot/stdout.expected + echo "commit + $(pop_id 9 $ids)" >> $testroot/stdout.expected + echo "blob - $(pop_id 4 $alpha_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 5 $alpha_ids)" >> $testroot/stdout.expected + echo '--- alpha' >> $testroot/stdout.expected + echo '+++ alpha' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-alpha change 6' >> $testroot/stdout.expected + echo '+alpha change 8' >> $testroot/stdout.expected + + (cd $testroot/wt && got diff -c:base:+20 > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "diff failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "diff $(pop_id 3 $ids) $(pop_id 9 $ids)" > \ + $testroot/stdout.expected + echo "commit - $(pop_id 3 $ids)" >> $testroot/stdout.expected + echo "commit + $(pop_id 9 $ids)" >> $testroot/stdout.expected + echo "blob - $(pop_id 2 $alpha_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 5 $alpha_ids)" >> $testroot/stdout.expected + echo '--- alpha' >> $testroot/stdout.expected + echo '+++ alpha' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-alpha change 2' >> $testroot/stdout.expected + echo '+alpha change 8' >> $testroot/stdout.expected + echo "blob - $(pop_id 2 $beta_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 5 $beta_ids)" >> $testroot/stdout.expected + echo '--- beta' >> $testroot/stdout.expected + echo '+++ beta' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-beta change 1' >> $testroot/stdout.expected + echo '+beta change 7' >> $testroot/stdout.expected + + (cd $testroot/wt && got diff -c:base -c:head > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "diff failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "diff $(pop_id 6 $ids) $(pop_id 8 $ids)" > \ + $testroot/stdout.expected + echo "commit - $(pop_id 6 $ids)" >> $testroot/stdout.expected + echo "commit + $(pop_id 8 $ids)" >> $testroot/stdout.expected + echo "blob - $(pop_id 3 $alpha_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 4 $alpha_ids)" >> $testroot/stdout.expected + echo '--- alpha' >> $testroot/stdout.expected + echo '+++ alpha' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-alpha change 4' >> $testroot/stdout.expected + echo '+alpha change 6' >> $testroot/stdout.expected + echo "blob - $(pop_id 4 $beta_ids)" >> $testroot/stdout.expected + echo "blob + $(pop_id 5 $beta_ids)" >> $testroot/stdout.expected + echo '--- beta' >> $testroot/stdout.expected + echo '+++ beta' >> $testroot/stdout.expected + echo '@@ -1 +1 @@' >> $testroot/stdout.expected + echo '-beta change 5' >> $testroot/stdout.expected + echo '+beta change 7' >> $testroot/stdout.expected + + got diff -r "$testroot/repo" -cmaster:-3 -c:head:-1 > $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + echo "diff failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "'-c BASE' requires work tree" > "$testroot/stderr.expected" + + got diff -r "$testroot/repo" -c:base -c:head 2> $testroot/stderr + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + fi + + test_done "$testroot" "$ret" +} + test_parseargs "$@" run_test test_diff_basic run_test test_diff_shows_conflict @@ -2041,3 +2289,4 @@ run_test test_diff_path_in_root_commit run_test test_diff_file_to_dir run_test test_diff_dir_to_file run_test test_diff_path_in_root_commit +run_test test_diff_commit_keywords blob - aa6a545fe216654b76ca23bbe186211d313c59a2 blob + 1af7d9b31a2f85909dcb3c8a8f8279d7c5f5a5f8 --- regress/cmdline/log.sh +++ regress/cmdline/log.sh @@ -900,6 +900,109 @@ test_parseargs "$@" test_done "$testroot" "$ret" } +test_log_commit_keywords() { + local testroot=$(test_init log_commit_keywords) + local commit_time=`git_show_author_time $testroot/repo` + local d=`date -u -r $commit_time +"%G-%m-%d"` + + set -A ids "$(git_show_head $testroot/repo)" + + got checkout $testroot/repo $testroot/wt > /dev/null + ret=$? + if [ $ret -ne 0 ]; then + echo "checkout failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + + for i in $(seq 16); do + echo "alpha change $i" > "$testroot/wt/alpha" + + (cd "$testroot/wt" && got ci -m "commit number $i" > /dev/null) + ret=$? + if [ $ret -ne 0 ]; then + echo "commit failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + set -- "$ids" "$(git_show_head $testroot/repo)" + ids=$* + done + + for i in $(seq 16 2); do + printf '%s %.7s commit number %s\n' \ + "$d" $(pop_id $i $ids) "$(( i-1 ))" \ + >> $testroot/stdout.expected + done + + got log -r "$testroot/repo" -scmaster:- -l15 > $testroot/stdout + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + (cd $testroot/wt && got update -c:head:-8 > /dev/null) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + echo -n > "$testroot/stdout.expected" + + for i in $(seq 9 2); do + printf '%s %.7s commit number %s\n' \ + "$d" $(pop_id $i $ids) "$(( i-1 ))" \ + >> $testroot/stdout.expected + done + printf '%s %.7s adding the test tree\n' "$d" $(pop_id 1 $ids) >> \ + $testroot/stdout.expected + + (cd $testroot/wt && got log -sc:base > $testroot/stdout) + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + # if + modifier is too great, use HEAD commit + printf '%s %-7s commit number %s\n' "$d" master 16 > \ + $testroot/stdout.expected + printf '%s %.7s commit number %s\n' "$d" $(pop_id 16 $ids) 15 >> \ + $testroot/stdout.expected + + (cd $testroot/wt && got log -sc:base:+20 -l2 > $testroot/stdout) + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + # if - modifier is too great, use root commit + printf '%s %.7s adding the test tree\n' "$d" $(pop_id 1 $ids) > \ + $testroot/stdout.expected + + (cd $testroot/wt && got log -sc:base:-10 > $testroot/stdout) + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + fi + + test_done "$testroot" "$ret" +} + test_parseargs "$@" run_test test_log_in_repo run_test test_log_in_bare_repo @@ -916,3 +1019,4 @@ run_test test_log_diffstat run_test test_log_changed_paths run_test test_log_submodule run_test test_log_diffstat +run_test test_log_commit_keywords blob - c08237c6cd1b14453b8e4f8e39789a3c6c017f1c blob + dcd94a91284bd59bcbe4cb0e10e015293ad98bb4 --- regress/cmdline/update.sh +++ regress/cmdline/update.sh @@ -3230,6 +3230,268 @@ test_parseargs "$@" test_done "$testroot" 0 } +test_update_commit_keywords() { + local testroot=`test_init update_commit_keywords` + + set -A ids "$(git_show_head $testroot/repo)" + + got checkout $testroot/repo $testroot/wt > /dev/null + ret=$? + if [ $ret -ne 0 ]; then + echo "checkout failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + + for i in `seq 8`; do + if [ $(( i % 2 )) -eq 0 ]; then + echo "alpha change $i" > "$testroot/wt/alpha" + else + echo "beta change $i" > "$testroot/wt/beta" + fi + + (cd "$testroot/wt" && got ci -m "commit number $i" > /dev/null) + ret=$? + if [ $ret -ne 0 ]; then + echo "commit failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + set -- "$ids" "$(git_show_head $testroot/repo)" + ids=$* + done + + echo "got: reference base not found" > $testroot/stderr.expected + + (cd $testroot/wt && got update -cbase:-2 2> $testroot/stderr) + ret=$? + if [ $ret -ne 1 ]; then + echo "update succeeded unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stderr.expected $testroot/stderr + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stderr.expected $testroot/stderr + test_done "$testroot" "$ret" + return 1 + fi + + echo "U alpha" > $testroot/stdout.expected + echo "U beta" >> $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 7 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -c:base:-2 > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "U beta" > $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 8 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -cmaster:- > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "alpha change 6" > $testroot/content.expected + cat $testroot/wt/alpha > $testroot/content + + cmp -s $testroot/content.expected $testroot/content + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/content.expected $testroot/content + test_done "$testroot" "$ret" + return 1 + fi + + echo "U alpha" > $testroot/stdout.expected + echo "U beta" >> $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 2 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -c:base:-6 > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "beta change 1" > $testroot/content.expected + cat $testroot/wt/beta > $testroot/content + + cmp -s $testroot/content.expected $testroot/content + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/content.expected $testroot/content + test_done "$testroot" "$ret" + return 1 + fi + + echo "U alpha" > $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 3 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -c:base:+ > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "alpha change 2" > $testroot/content.expected + cat $testroot/wt/alpha > $testroot/content + + cmp -s $testroot/content.expected $testroot/content + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/content.expected $testroot/content + test_done "$testroot" "$ret" + return 1 + fi + + echo "U alpha" > $testroot/stdout.expected + echo "U beta" >> $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 7 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -c:head:-2 > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "alpha change 6" > $testroot/content.expected + cat $testroot/wt/alpha > $testroot/content + + cmp -s $testroot/content.expected $testroot/content + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/content.expected $testroot/content + test_done "$testroot" "$ret" + return 1 + fi + + # if - modifier is too great, use root commit + echo "U alpha" > $testroot/stdout.expected + echo "U beta" >> $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 1 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -c:base:-20 > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "alpha" > $testroot/content.expected + cat $testroot/wt/alpha > $testroot/content + + cmp -s $testroot/content.expected $testroot/content + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/content.expected $testroot/content + test_done "$testroot" "$ret" + return 1 + fi + + # if + modifier is too great, use HEAD commit + echo "U alpha" > $testroot/stdout.expected + echo "U beta" >> $testroot/stdout.expected + echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected + echo $(pop_id 9 $ids) >> "$testroot/stdout.expected" + + (cd $testroot/wt && got update -c:head:+10 > $testroot/stdout) + ret=$? + if [ $ret -ne 0 ]; then + echo "update failed unexpectedly" >&2 + test_done "$testroot" "1" + return 1 + fi + + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + echo "alpha change 8" > $testroot/content.expected + cat $testroot/wt/alpha > $testroot/content + + cmp -s $testroot/content.expected $testroot/content + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/content.expected $testroot/content + fi + test_done "$testroot" "$ret" +} + test_parseargs "$@" run_test test_update_basic run_test test_update_adds_file @@ -3278,3 +3540,4 @@ run_test test_update_umask run_test test_update_quiet run_test test_update_binary_file run_test test_update_umask +run_test test_update_commit_keywords -- Mark Jamsek GPG: F2FF 13DE 6A06 C471 CA80 E6E2 2930 DC66 86EE CF68