This is an archive of the discontinued Mercurial Phabricator instance.

Differential D184

infinitepush: add summary of not-backed-up files to smartlog
ClosedPublic

Authored by mbthomas on Jul 26 2017, 11:53 AM.

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGX49fbdb58bc20: infinitepush: add summary of not-backed-up files to smartlog
Summary

Allow summarisation of commits that have not been backed up
by infinitepush.

  1. Add a template keyword (backupstatus) which evaluates to one of "Public", "Backed up", "Backup pending", or "Not backed up" depending on the backup state of the commit. Commits are pending for 10 minutes, after which they are declared not backed up.
  1. Add a summary to the end of smartlog that shows the number of commits that are not backed up.

    Configuration options allow the addition of an education message to inform users what to do about their failing backups, and the message can also be suppressed.
Test Plan
New unit test for both the keyword and the summary.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

mbthomas created this revision.Jul 26 2017, 11:53 AM
akushner added a subscriber: akushner.Jul 26 2017, 1:08 PM
akushner added inline comments.
tests/test-infinitepush-backup-status.t
86

Might be worthwhile giving slightly more detail. "not backed up" might be worrying. Do people know the expectations for when things are backed up? Should there be advice on how to use 'hg pushbackup' if they are immediately going offline on their laptop?

quark added a subscriber: quark.Jul 26 2017, 6:39 PM

I also think the text might be a bit too verbose. Maybe make it part of the ssl template, or just some color changes in sl output.

infinitepush/backupcommands.py
29

According to a recent discussion, we prefer suppress-summary style config names.

310

Instead of implementing it as a template keyword that hardcodes the text, have you considered implementing a revset that returns all commits that are backed-up?

Supposed the revset was called backedup(), we can use it in templates to customize the text (and color) in our template configs:

hg sl -T '{if(revset("{rev} and backedup()"), "Backed Up")}'

Besides, people gain the flexibility of querying what are (and are not) backed up using revsets:

hg log -r 'backedup()'
hg log -r 'draft() - backedup()'
319

nit: no underscore in variable or method names.

Same for smartlog_summary and other places.

337

nit: prefer changeset to commit as a noun.

mitrandir added a subscriber: mitrandir.Jul 27 2017, 6:30 AM
mitrandir added inline comments.
tests/test-infinitepush-backup-status.t
86

I have similar concerns about this: how is the message actionable?

mbthomas updated this revision to Diff 424.Jul 27 2017, 8:33 AM

Add configuration option for enabling backup status reporting

mbthomas added a comment.Jul 27 2017, 9:06 AM

More changes incoming to fix up naming of things.

infinitepush/backupcommands.py
310

I hadn't considered that, but it sounds like a good idea. I'll take a look at what it involves.

The purpose of this change is to highlight commits that are more than 10 minutes old but not backed up. That's almost possible with revset syntax, except date() doesn't accept relative date specs. Otherwise I could use (draft() & date("<10 minutes ago")) - backedup(). Is there a way to do that that I am missing?

tests/test-infinitepush-backup-status.t
86

It's expected that the actions the user will need to take will vary depending on the installation, which is the purpose of the "smartlog_education" configuration option. In fact it might just be that the user is offline (and they realise this), which is why backups aren't currently taking place. In which case, this note is just a count of the commits they haven't been able to back up yet.

quark added inline comments.Jul 27 2017, 3:25 PM
infinitepush/backupcommands.py
310

Unfortunately, date does not support that today. I think -1 (within 1 day) could be a good approximate and we could enhance the date revset with another patch.

stash requested changes to this revision.Jul 28 2017, 5:17 AM
stash added inline comments.
infinitepush/backupcommands.py
27–37

I'm worried about the number of options infinitepush has. How about leaving just one option enablestatus? We can hardcode smartlog_education to

Run `hg pushbackup` to run a backup. If it fails please report to Source Control@Fb group.

And we can suppress smartlog summary if enablestatus is false. What do you think?

310

Let's use a revsets instead of templates. Maybe it's not even worth changing the date() revset, -1 day may be enough.

314–315

I think we discussed offline that we don't want to return 'Public' and 'Backed up'. Have you changed your mind?

321–324

It looks a bit more complicated that I imagined it. Why not:

if time.time() - ctx.date()[0] > 60 * 10:  # 10 minutes
  return 'Backup pending'
343

In that case it would be great to also print commit hash

This revision now requires changes to proceed.Jul 28 2017, 5:17 AM
mbthomas added inline comments.Jul 28 2017, 6:48 AM
infinitepush/backupcommands.py
310

I was wondering whether an age() revset would be a useful addition in general, e.g. age('>10m'), age('<20d'), etc.

quark added inline comments.Jul 28 2017, 11:05 AM
infinitepush/backupcommands.py
310

If you want to make date more flexible, have a look at mercurial.util.matchdate.

mbthomas edited edge metadata.Jul 28 2017, 1:47 PM
mbthomas updated this revision to Diff 445.

Switch to revsetpredicate for backedup()

mbthomas marked 6 inline comments as done.Jul 28 2017, 3:34 PM
mbthomas added inline comments.
infinitepush/backupcommands.py
310

I'm going to add a new age() predicate as a separate diff.

stash added inline comments.Jul 28 2017, 4:02 PM
infinitepush/backupcommands.py
310

How's it different from date(...) revset?

mbthomas marked 3 inline comments as done.Jul 31 2017, 5:39 AM
mbthomas added inline comments.
infinitepush/backupcommands.py
310

Both work on the date of the commit, but age() matches commits based on relative time, whereas date() is absolute time.

I could put this functionality in date(), but I think it's better separate, because:

  • Mercurial's date parsing is custom - I'd need to modify core mercurial to change it, and be careful not to break it.
  • The UX would be fairly poor, date("<2 hours ago") would mean "before 2 hours ago", even though it reads like "less than 2 hours ago".
  • Doing it this way results in a fairly trivial extension.
tests/test-infinitepush-backup-status.t
86

Will update the message as suggested above.

stash requested changes to this revision.Jul 31 2017, 6:28 AM
stash added inline comments.
infinitepush/backupcommands.py
320–322

This is a copy-paste from backedup() function. But that's not a big problem. The bigger problem is if bkpstate.heads have a non-visible commit (it shouldn't happen, but I wouldn't be surprised if it happens from time to time). In that case we'll show to a user that some commits haven't been backed up while nothing is shown in smartlog. I think what we should do is to not use unfiltered repo and filter invisible bkpstate.heads.

visiblebpkstateheads = [head for head in bkpstate.heads if head in repo]
tests/test-infinitepush-backup-status.t
33–39

Instead of pushing you can just do hg phase -p -r . -f

89

Also makes sense to add a test if multiple commits weren't backed up

This revision now requires changes to proceed.Jul 31 2017, 6:28 AM
mbthomas edited edge metadata.Jul 31 2017, 10:13 AM
mbthomas marked 3 inline comments as done.
mbthomas updated this revision to Diff 451.

Rebase and apply review markups

mbthomas marked 11 inline comments as done.Jul 31 2017, 10:32 AM
mbthomas added inline comments.
tests/test-infinitepush-backup-status.t
33–39

I think it's better to leave it as "push" as that better replicates what users would do. The pushbackup 3 lines below would push the commit anyway, so nothing is saved by faking the push.

quark added inline comments.Jul 31 2017, 12:48 PM
infinitepush/backupcommands.py
310

date() accepts relative times too:

- "-DAYS" - within a given number of days of today

So I think it's cleaner to implement there.

stash added a comment.Jul 31 2017, 1:06 PM

@quark , we decided to use age(...) for now, and create a task to move this functionality to date(...) revset.

stash accepted this revision.EditedJul 31 2017, 1:11 PM

Let's also keep an eye on how long smartlog takes after this change

This revision is now accepted and ready to land.Jul 31 2017, 1:11 PM
mbthomas closed this revision.Aug 2 2017, 5:28 AM

Revision Contents
Changeset List

Diff 451

infinitepush/__init__.py

pushrebaseparttype = 'b2x:rebase' pushrebaseparttype = 'b2x:rebase'
experimental = 'experimental' experimental = 'experimental'
configbookmark = 'server-bundlestore-bookmark' configbookmark = 'server-bundlestore-bookmark'
configcreate = 'server-bundlestore-create' configcreate = 'server-bundlestore-create'
configscratchpush = 'infinitepush-scratchpush' configscratchpush = 'infinitepush-scratchpush'
confignonforwardmove = 'non-forward-move' confignonforwardmove = 'non-forward-move'
cmdtable = infinitepushcommands.cmdtable cmdtable = infinitepushcommands.cmdtable
revsetpredicate = backupcommands.revsetpredicate
_scratchbranchmatcher = lambda x: False _scratchbranchmatcher = lambda x: False
_maybehash = re.compile(r'^[a-f0-9]+$').search _maybehash = re.compile(r'^[a-f0-9]+$').search
def _buildexternalbundlestore(ui): def _buildexternalbundlestore(ui):
put_args = ui.configlist('infinitepush', 'put_args', []) put_args = ui.configlist('infinitepush', 'put_args', [])
put_binary = ui.config('infinitepush', 'put_binary') put_binary = ui.config('infinitepush', 'put_binary')
if not put_binary: if not put_binary:
raise error.Abort('put binary is not specified') raise error.Abort('put binary is not specified')
# to avoid generation of both parts. # to avoid generation of both parts.
partorder = exchange.b2partsgenorder partorder = exchange.b2partsgenorder
index = partorder.index('changeset') index = partorder.index('changeset')
if pushrebaseparttype in partorder: if pushrebaseparttype in partorder:
index = min(index, partorder.index(pushrebaseparttype)) index = min(index, partorder.index(pushrebaseparttype))
partorder.insert( partorder.insert(
index, partorder.pop(partorder.index(scratchbranchparttype))) index, partorder.pop(partorder.index(scratchbranchparttype)))
def wrapsmartlog(loaded):
if not loaded:
return
smartlogmod = extensions.find('smartlog')
wrapcommand(smartlogmod.cmdtable, 'smartlog', _smartlog)
extensions.afterloaded('smartlog', wrapsmartlog)
def _smartlog(orig, ui, repo, **opts):
res = orig(ui, repo, **opts)
backupcommands.smartlogsummary(ui, repo)
return res
def _showbookmarks(ui, bookmarks, **opts): def _showbookmarks(ui, bookmarks, **opts):
# Copy-paste from commands.py # Copy-paste from commands.py
fm = ui.formatter('bookmarks', opts) fm = ui.formatter('bookmarks', opts)
for bmark, n in sorted(bookmarks.iteritems()): for bmark, n in sorted(bookmarks.iteritems()):
fm.startitem() fm.startitem()
if not ui.quiet: if not ui.quiet:
fm.plain(' ') fm.plain(' ')
fm.write('bookmark', '%s', bmark) fm.write('bookmark', '%s', bmark)

infinitepush/backupcommands.py

# Special option that may be used to trigger re-backuping. For example, # Special option that may be used to trigger re-backuping. For example,
# if there was a bug in infinitepush backups, then changing the value of # if there was a bug in infinitepush backups, then changing the value of
# this option will force all clients to make a "clean" backup # this option will force all clients to make a "clean" backup
backupgeneration = 0 backupgeneration = 0
# Hostname value to use. If not specified then socket.gethostname() will # Hostname value to use. If not specified then socket.gethostname() will
# be used # be used
hostname = '' hostname = ''
# Enable reporting of infinitepush backup status as a summary at the end
# of smartlog.
enablestatus = False
quarkUnsubmitted
Done

According to a recent discussion, we prefer suppress-summary style config names.

quark: According to a recent discussion, we prefer `suppress-summary` style config names.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import json import json
import os import os
import re import re
import socket import socket
stashUnsubmitted
Done

I'm worried about the number of options infinitepush has. How about leaving just one option enablestatus? We can hardcode smartlog_education to

Run `hg pushbackup` to run a backup. If it fails please report to Source Control@Fb group.

And we can suppress smartlog summary if enablestatus is false. What do you think?

stash: I'm worried about the number of options infinitepush has. How about leaving just one option…
import stat import stat
import subprocess import subprocess
import time import time
from .bundleparts import ( from .bundleparts import (
getscratchbookmarkspart, getscratchbookmarkspart,
getscratchbranchpart, getscratchbranchpart,
) )
registrar, registrar,
scmutil, scmutil,
util, util,
) )
from collections import defaultdict, namedtuple from collections import defaultdict, namedtuple
from mercurial import policy from mercurial import policy
from mercurial.extensions import wrapfunction, unwrapfunction from mercurial.extensions import wrapfunction, unwrapfunction
from mercurial.node import bin, hex, nullrev from mercurial.node import bin, hex, nullrev, short
from mercurial.i18n import _ from mercurial.i18n import _
osutil = policy.importmod(r'osutil') osutil = policy.importmod(r'osutil')
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
revsetpredicate = registrar.revsetpredicate()
backupbookmarktuple = namedtuple('backupbookmarktuple', backupbookmarktuple = namedtuple('backupbookmarktuple',
['hostname', 'reporoot', 'localbookmark']) ['hostname', 'reporoot', 'localbookmark'])
class backupstate(object): class backupstate(object):
def __init__(self): def __init__(self):
self.heads = set() self.heads = set()
self.localbookmarks = {} self.localbookmarks = {}
bkpstate = _readlocalbackupstate(ui, repo) bkpstate = _readlocalbackupstate(ui, repo)
unfi = repo.unfiltered() unfi = repo.unfiltered()
backeduprevs = unfi.revs('draft() and ::%ls', bkpstate.heads) backeduprevs = unfi.revs('draft() and ::%ls', bkpstate.heads)
for r in scmutil.revrange(unfi, revs): for r in scmutil.revrange(unfi, revs):
ui.write(_(unfi[r].hex() + ' ')) ui.write(_(unfi[r].hex() + ' '))
ui.write(_('backed up' if r in backeduprevs else 'not backed up')) ui.write(_('backed up' if r in backeduprevs else 'not backed up'))
ui.write(_('\n')) ui.write(_('\n'))
@revsetpredicate('backedup')
def backedup(repo, subset, x):
quarkUnsubmitted
Done

Instead of implementing it as a template keyword that hardcodes the text, have you considered implementing a revset that returns all commits that are backed-up?

Supposed the revset was called backedup(), we can use it in templates to customize the text (and color) in our template configs:

hg sl -T '{if(revset("{rev} and backedup()"), "Backed Up")}'

Besides, people gain the flexibility of querying what are (and are not) backed up using revsets:

hg log -r 'backedup()'
hg log -r 'draft() - backedup()'
quark: Instead of implementing it as a template keyword that hardcodes the text, have you considered…
mbthomasAuthorUnsubmitted
Done

I hadn't considered that, but it sounds like a good idea. I'll take a look at what it involves.

The purpose of this change is to highlight commits that are more than 10 minutes old but not backed up. That's almost possible with revset syntax, except date() doesn't accept relative date specs. Otherwise I could use (draft() & date("<10 minutes ago")) - backedup(). Is there a way to do that that I am missing?

mbthomas: I hadn't considered that, but it sounds like a good idea. I'll take a look at what it involves.
quarkUnsubmitted
Done

Unfortunately, date does not support that today. I think -1 (within 1 day) could be a good approximate and we could enhance the date revset with another patch.

quark: Unfortunately, `date` does not support that today. I think `-1` (within 1 day) could be a good…
stashUnsubmitted
Done

Let's use a revsets instead of templates. Maybe it's not even worth changing the date() revset, -1 day may be enough.

stash: Let's use a revsets instead of templates. Maybe it's not even worth changing the date() revset…
mbthomasAuthorUnsubmitted
Done

I was wondering whether an age() revset would be a useful addition in general, e.g. age('>10m'), age('<20d'), etc.

mbthomas: I was wondering whether an `age()` revset would be a useful addition in general, e.g. `age…
quarkUnsubmitted
Done

If you want to make date more flexible, have a look at mercurial.util.matchdate.

quark: If you want to make `date` more flexible, have a look at `mercurial.util.matchdate`.
mbthomasAuthorUnsubmitted
Done

I'm going to add a new age() predicate as a separate diff.

mbthomas: I'm going to add a new `age()` predicate as a separate diff.
stashUnsubmitted
Done

How's it different from date(...) revset?

stash: How's it different from `date(...)` revset?
mbthomasAuthorUnsubmitted
Done

Both work on the date of the commit, but age() matches commits based on relative time, whereas date() is absolute time.

I could put this functionality in date(), but I think it's better separate, because:

  • Mercurial's date parsing is custom - I'd need to modify core mercurial to change it, and be careful not to break it.
  • The UX would be fairly poor, date("<2 hours ago") would mean "before 2 hours ago", even though it reads like "less than 2 hours ago".
  • Doing it this way results in a fairly trivial extension.
mbthomas: Both work on the date of the commit, but `age()` matches commits based on relative time…
quarkUnsubmitted
Not Done

date() accepts relative times too:

- "-DAYS" - within a given number of days of today

So I think it's cleaner to implement there.

quark: `date()` accepts relative times too: ``` - "-DAYS" - within a given number of days of…
"""Draft changesets that have been backed up by infinitepush"""
bkpstate = _readlocalbackupstate(repo.ui, repo)
visiblebkpheads = [head for head in bkpstate.heads if head in repo]
return subset & repo.revs('draft() and ::%ls', visiblebkpheads)
stashUnsubmitted
Done

I think we discussed offline that we don't want to return 'Public' and 'Backed up'. Have you changed your mind?

stash: I think we discussed offline that we don't want to return 'Public' and 'Backed up'. Have you…
def smartlogsummary(ui, repo):
if not ui.configbool('infinitepushbackup', 'enablestatus'):
return
quarkUnsubmitted
Done

nit: no underscore in variable or method names.

Same for smartlog_summary and other places.

quark: nit: no underscore in variable or method names. Same for `smartlog_summary` and other places.
bkpstate = _readlocalbackupstate(ui, repo)
visiblebkpheads = [head for head in bkpstate.heads if head in repo]
unbackeduprevs = repo.revs('draft() and not ::%ls', visiblebkpheads)
stashUnsubmitted
Done

This is a copy-paste from backedup() function. But that's not a big problem. The bigger problem is if bkpstate.heads have a non-visible commit (it shouldn't happen, but I wouldn't be surprised if it happens from time to time). In that case we'll show to a user that some commits haven't been backed up while nothing is shown in smartlog. I think what we should do is to not use unfiltered repo and filter invisible bkpstate.heads.

visiblebpkstateheads = [head for head in bkpstate.heads if head in repo]
stash: This is a copy-paste from `backedup()` function. But that's not a big problem. The bigger…
# Count the number of changesets that haven't been backed up for 10 minutes.
stashUnsubmitted
Done

It looks a bit more complicated that I imagined it. Why not:

if time.time() - ctx.date()[0] > 60 * 10:  # 10 minutes
  return 'Backup pending'
stash: It looks a bit more complicated that I imagined it. Why not: ``` if time.time() - ctx.date()…
# If there is only one, also print out its hash.
backuptime = time.time() - 10 * 60 # 10 minutes ago
count = 0
singleunbackeduprev = None
for rev in unbackeduprevs:
if repo[rev].date()[0] <= backuptime:
singleunbackeduprev = rev
count += 1
if count > 0:
if count > 1:
ui.warn(_('note: %d changesets are not backed up.\n') % count)
else:
ui.warn(_('note: changeset %s is not backed up.\n') %
quarkUnsubmitted
Done

nit: prefer changeset to commit as a noun.

quark: nit: prefer `changeset` to `commit` as a noun.
short(repo[singleunbackeduprev].node()))
ui.warn(_('Run `hg pushbackup` to perform a backup. If this fails,\n'
'please report to the Source Control @ FB group.\n'))
def _dobackup(ui, repo, dest, **opts): def _dobackup(ui, repo, dest, **opts):
ui.status(_('starting backup %s\n') % time.strftime('%H:%M:%S %d %b %Y %Z')) ui.status(_('starting backup %s\n') % time.strftime('%H:%M:%S %d %b %Y %Z'))
stashUnsubmitted
Done

In that case it would be great to also print commit hash

stash: In that case it would be great to also print commit hash
start = time.time() start = time.time()
# to handle multiple working copies correctly # to handle multiple working copies correctly
repo = _getsrcrepo(repo) repo = _getsrcrepo(repo)
currentbkpgenerationvalue = _readbackupgenerationfile(repo.vfs) currentbkpgenerationvalue = _readbackupgenerationfile(repo.vfs)
newbkpgenerationvalue = ui.configint('infinitepushbackup', newbkpgenerationvalue = ui.configint('infinitepushbackup',
'backupgeneration', 0) 'backupgeneration', 0)
if currentbkpgenerationvalue != newbkpgenerationvalue: if currentbkpgenerationvalue != newbkpgenerationvalue:
# Unlinking local backup state will trigger re-backuping # Unlinking local backup state will trigger re-backuping
with repo.vfs(_backupstatefile) as f: with repo.vfs(_backupstatefile) as f:
try: try:
state = json.loads(f.read()) state = json.loads(f.read())
if (not isinstance(state['bookmarks'], dict) or if (not isinstance(state['bookmarks'], dict) or
not isinstance(state['heads'], list)): not isinstance(state['heads'], list)):
raise ValueError('bad types of bookmarks or heads') raise ValueError('bad types of bookmarks or heads')
result = backupstate() result = backupstate()
result.heads = set(state['heads']) result.heads = set(map(str, state['heads']))
result.localbookmarks = state['bookmarks'] result.localbookmarks = state['bookmarks']
return result return result
except (ValueError, KeyError, TypeError) as e: except (ValueError, KeyError, TypeError) as e:
ui.warn(_('corrupt file: %s (%s)\n') % (_backupstatefile, e)) ui.warn(_('corrupt file: %s (%s)\n') % (_backupstatefile, e))
return backupstate() return backupstate()
return backupstate() return backupstate()
def _writelocalbackupstate(vfs, heads, bookmarks): def _writelocalbackupstate(vfs, heads, bookmarks):

tests/test-infinitepush-backup-status.t

  • This file was added.
$ setup() {
> cat << EOF >> .hg/hgrc
> [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend
> smartlog=$TESTDIR/../hgext3rd/smartlog.py
> [infinitepushbackup]
> enablestatus = True
> [experimental]
> evolution=createmarkers
> EOF
> }
$ . "$TESTDIR/library.sh"
$ . "$TESTDIR/library-infinitepush.sh"
$ setupcommon
Setup server
$ hg init repo
$ cd repo
$ setupserver
$ cd ..
Setup client
$ hg clone ssh://user@dummy/repo client -q
$ cd client
$ setup
$ now=`date +%s`
$ touch file1
$ hg add file1
$ commit_time=`expr $now - 15 \* 60`
$ hg commit -d "$commit_time 0" -m "Public changeset"
$ hg push
pushing to ssh://user@dummy/repo
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
$ echo a > file1
stashUnsubmitted
Not Done

Instead of pushing you can just do hg phase -p -r . -f

stash: Instead of pushing you can just do `hg phase -p -r . -f`
mbthomasAuthorUnsubmitted
Not Done

I think it's better to leave it as "push" as that better replicates what users would do. The pushbackup 3 lines below would push the commit anyway, so nothing is saved by faking the push.

mbthomas: I think it's better to leave it as "push" as that better replicates what users would do. The…
$ changeset_time=`expr $now - 13 \* 60`
$ hg commit -d "$commit_time 0" -m "Backed up changeset"
$ hg pushbackup
starting backup .* (re)
searching for changes
remote: pushing 1 commit:
remote: * Backed up changeset (glob)
finished in \d+\.(\d+)? seconds (re)
$ echo b > file1
$ commit_time=`expr $now - 11 \* 60`
$ hg commit -d "$commit_time 0" -m "Not backed up changeset"
$ echo c > file1
$ commit_time=`expr $now - 9 \* 60`
$ hg commit -d "$commit_time 0" -m "Backup pending changeset"
Check backup status of commits
$ hg log -T '{rev} {desc}\n' -r 'backedup()'
1 Backed up changeset
$ hg log -T '{rev} {desc}\n' -r 'draft() - backedup()'
2 Not backed up changeset
3 Backup pending changeset
Check smartlog output
$ hg smartlog
@ changeset: 3:* (glob)
| tag: tip
| user: test
| date: * (glob)
| summary: Backup pending changeset
|
o changeset: 2:* (glob)
| user: test
| date: * (glob)
| summary: Not backed up changeset
|
o changeset: 1:* (glob)
| user: test
| date: * (glob)
| summary: Backed up changeset
|
o changeset: 0:* (glob)
user: test
date: * (glob)
summary: Public changeset
note: changeset * is not backed up. (glob)
Run `hg pushbackup` to perform a backup. If this fails,
akushnerUnsubmitted
Done

Might be worthwhile giving slightly more detail. "not backed up" might be worrying. Do people know the expectations for when things are backed up? Should there be advice on how to use 'hg pushbackup' if they are immediately going offline on their laptop?

akushner: Might be worthwhile giving slightly more detail. "not backed up" might be worrying. Do people…
mitrandirUnsubmitted
Done

I have similar concerns about this: how is the message actionable?

mitrandir: I have similar concerns about this: how is the message actionable?
mbthomasAuthorUnsubmitted
Done

It's expected that the actions the user will need to take will vary depending on the installation, which is the purpose of the "smartlog_education" configuration option. In fact it might just be that the user is offline (and they realise this), which is why backups aren't currently taking place. In which case, this note is just a count of the commits they haven't been able to back up yet.

mbthomas: It's expected that the actions the user will need to take will vary depending on the…
mbthomasAuthorUnsubmitted
Done

Will update the message as suggested above.

mbthomas: Will update the message as suggested above.
please report to the Source Control @ FB group.
Check smartlog summary can be suppressed
stashUnsubmitted
Done

Also makes sense to add a test if multiple commits weren't backed up

stash: Also makes sense to add a test if multiple commits weren't backed up
$ hg smartlog -T '{rev}: {desc}\n' --config infinitepushbackup.enablestatus=no
@ 3: Backup pending changeset
|
o 2: Not backed up changeset
|
o 1: Backed up changeset
|
o 0: Public changeset
Check smartlog summary with multiple unbacked up changesets
$ hg up 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b2 > file1
$ commit_time=`expr $now - 11 \* 60`
$ hg commit -d "$commit_time 0" -m "Not backed up changeset 2"
created new head
$ hg smartlog -T '{rev}: {desc}\n'
@ 4: Not backed up changeset 2
|
| o 3: Backup pending changeset
|/
o 2: Not backed up changeset
|
o 1: Backed up changeset
|
o 0: Public changeset
note: 2 changesets are not backed up.
Run `hg pushbackup` to perform a backup. If this fails,
please report to the Source Control @ FB group.