diff options
author | Michael Muré <batolettre@gmail.com> | 2019-11-03 16:46:51 +0100 |
---|---|---|
committer | amine <hilalyamine@gmail.com> | 2019-11-03 17:23:05 +0100 |
commit | 57e23c8ada0a9d921a6b68187a76eb5c8b8a407d (patch) | |
tree | 05ab55090bf196b940a4f6b0e4aaec9975b997bc /repository | |
parent | 614bc5a2c53409a8e9c85ab31a104428069aa7b3 (diff) | |
download | git-bug-57e23c8ada0a9d921a6b68187a76eb5c8b8a407d.tar.gz |
bridge: improvement on the import resume feature
Diffstat (limited to 'repository')
-rw-r--r-- | repository/config.go | 9 | ||||
-rw-r--r-- | repository/config_git.go | 4 | ||||
-rw-r--r-- | repository/config_mem.go | 10 |
3 files changed, 11 insertions, 12 deletions
diff --git a/repository/config.go b/repository/config.go index ec5094e0..d72e7b4e 100644 --- a/repository/config.go +++ b/repository/config.go @@ -32,18 +32,17 @@ type Config interface { // ReadTimestamp read a single timestamp value from the config // Return ErrNoConfigEntry or ErrMultipleConfigEntry if // there is zero or more than one entry for this key - ReadTimestamp(key string) (*time.Time, error) + ReadTimestamp(key string) (time.Time, error) // RemoveAll removes all key/value pair matching the key prefix RemoveAll(keyPrefix string) error } -func parseTimestamp(s string) (*time.Time, error) { +func parseTimestamp(s string) (time.Time, error) { timestamp, err := strconv.Atoi(s) if err != nil { - return nil, err + return time.Time{}, err } - t := time.Unix(int64(timestamp), 0) - return &t, nil + return time.Unix(int64(timestamp), 0), nil } diff --git a/repository/config_git.go b/repository/config_git.go index eac882a2..63ca2457 100644 --- a/repository/config_git.go +++ b/repository/config_git.go @@ -111,10 +111,10 @@ func (gc *gitConfig) ReadBool(key string) (bool, error) { return strconv.ParseBool(val) } -func (gc *gitConfig) ReadTimestamp(key string) (*time.Time, error) { +func (gc *gitConfig) ReadTimestamp(key string) (time.Time, error) { value, err := gc.ReadString(key) if err != nil { - return nil, err + return time.Time{}, err } return parseTimestamp(value) } diff --git a/repository/config_mem.go b/repository/config_mem.go index e2cffd9c..bd680d03 100644 --- a/repository/config_mem.go +++ b/repository/config_mem.go @@ -59,18 +59,18 @@ func (mc *memConfig) ReadBool(key string) (bool, error) { return strconv.ParseBool(val) } -func (mc *memConfig) ReadTimestamp(key string) (*time.Time, error) { +func (mc *memConfig) ReadTimestamp(key string) (time.Time, error) { value, err := mc.ReadString(key) if err != nil { - return nil, err + return time.Time{}, err } + timestamp, err := strconv.Atoi(value) if err != nil { - return nil, err + return time.Time{}, err } - t := time.Unix(int64(timestamp), 0) - return &t, nil + return time.Unix(int64(timestamp), 0), nil } // RmConfigs remove all key/value pair matching the key prefix |