# # # patch "cmd_merging.cc" # from [a6a760ab871f1d14a3b9cd58b43c026326b7e35d] # to [be7e9979e0f03853b2b7f858f1cfe84b16b19563] # # patch "cmd_netsync.cc" # from [fe74ba809d95febb94f85a2d2ed9f761c93e25bd] # to [ce40d6901889bc628c54a759b95f9feee72bfcba] # # patch "cmd_ws_commit.cc" # from [b29545c7fd88a94d14d3b6955505e7e179c70d73] # to [dc09eabd9e311dee30ef37ef52e2f0a49e19b268] # ============================================================ --- cmd_merging.cc a6a760ab871f1d14a3b9cd58b43c026326b7e35d +++ cmd_merging.cc be7e9979e0f03853b2b7f858f1cfe84b16b19563 @@ -280,6 +280,17 @@ CMD(update, "update", "", CMD_REF(worksp P(F("updated to base revision %s") % chosen_rid); } +CMD_AUTOMATE(update, "", + N_("Updates the workspace"), + N_("This command modifies your workspace to be based off of a " + "different revision, preserving uncommitted changes as it does so. " + "If a revision is given, update the workspace to that revision. " + "If not, update the workspace to the head of the branch."), + options::opts::none) +{ + commands::update_cmd.exec(app, execid, args); +} + // Subroutine of CMD(merge) and CMD(explicit_merge). Merge LEFT with RIGHT, // placing results onto BRANCH. Note that interactive_merge_and_store may // bomb out, and therefore so may this. @@ -432,6 +443,13 @@ CMD(merge, "merge", "", CMD_REF(tree), " P(F("note: your workspaces have not been updated")); } +CMD_AUTOMATE(merge, "", + N_("Merges unmerged heads of a branch"), "", + options::opts::none) +{ + commands::merge_cmd.exec(app, execid, args); +} + CMD(propagate, "propagate", "", CMD_REF(tree), N_("SOURCE-BRANCH DEST-BRANCH"), N_("Merges from one branch to another asymmetrically"), ============================================================ --- cmd_netsync.cc fe74ba809d95febb94f85a2d2ed9f761c93e25bd +++ cmd_netsync.cc ce40d6901889bc628c54a759b95f9feee72bfcba @@ -166,6 +166,16 @@ CMD(push, "push", "", CMD_REF(network), include_pattern, exclude_pattern, app); } +CMD_AUTOMATE(push, + N_("[ADDRESS[:PORTNUMBER] [PATTERN ...]]"), + N_("Pushes branches to a netsync server"), + N_("This will push all branches that match the pattern given in PATTERN " + "to the netsync server at the address ADDRESS."), + options::opts::none) +{ + commands::push_cmd.exec(app, execid, args); +} + CMD(pull, "pull", "", CMD_REF(network), N_("[ADDRESS[:PORTNUMBER] [PATTERN ...]]"), N_("Pulls branches from a netsync server"), @@ -186,6 +196,16 @@ CMD(pull, "pull", "", CMD_REF(network), include_pattern, exclude_pattern, app); } +CMD_AUTOMATE(pull, + N_("[ADDRESS[:PORTNUMBER] [PATTERN ...]]"), + N_("Pulls branches from a netsync server"), + N_("This pulls all branches that match the pattern given in PATTERN " + "from the netsync server at the address ADDRESS."), + options::opts::none) +{ + commands::pull_cmd.exec(app, execid, args); +} + CMD(sync, "sync", "", CMD_REF(network), N_("[ADDRESS[:PORTNUMBER] [PATTERN ...]]"), N_("Synchronizes branches with a netsync server"), @@ -204,6 +224,16 @@ CMD(sync, "sync", "", CMD_REF(network), include_pattern, exclude_pattern, app); } +CMD_AUTOMATE(sync, + N_("[ADDRESS[:PORTNUMBER] [PATTERN ...]]"), + N_("Synchronizes branches with a netsync server"), + N_("This synchronizes branches that match the pattern given in PATTERN " + "with the netsync server at the address ADDRESS."), + options::opts::none) +{ + commands::sync_cmd.exec(app, execid, args); +} + class dir_cleanup_helper { public: ============================================================ --- cmd_ws_commit.cc b29545c7fd88a94d14d3b6955505e7e179c70d73 +++ cmd_ws_commit.cc dc09eabd9e311dee30ef37ef52e2f0a49e19b268 @@ -1220,6 +1220,14 @@ CMD(commit, "commit", "ci", CMD_REF(work } } +CMD_AUTOMATE(commit, + N_("[PATH]..."), + N_("Commits workspace changes to the database"), "", + options::opts::none) +{ + commands::commit_cmd.exec(app, execid, args); +} + CMD_NO_WORKSPACE(setup, "setup", "", CMD_REF(tree), N_("[DIRECTORY]"), N_("Sets up a new workspace directory"), N_("If no directory is specified, uses the current directory."),